mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-11 03:45:33 +00:00
Code Issues Projects Releases Wiki Activity

Make --rebuild option work again in

Browse Source 
Estimated hours taken: 0.5
Branches: main

compiler/make.util.m:
	Make --rebuild option work again in
	foldl2_maybe_stop_at_error_maybe_parallel, when parallel make is not
	used.  It was disabled for the sequential make pass, which is the only
	pass when parallel make is not enabled.
This commit is contained in:
Peter Wang
2007-09-24 01:21:14 +00:00
parent 000fc98539
commit 154ca51671
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
compiler/make.util.m
View File

@@ -407,9 +407,9 @@ foldl3_maybe_stop_at_error_2(KeepGoing, P, [T | Ts],
foldl2_maybe_stop_at_error_maybe_parallel(KeepGoing, MakeTarget, Targets,
Success, !Info, !IO) :-
% First pass.
globals.io_lookup_int_option(jobs, Jobs, !IO),
( Jobs > 1 ->
% First pass.
% fork() is disabled on threaded grades.
( process_util.can_fork ->
foldl2_maybe_stop_at_error_parallel_processes(KeepGoing, Jobs,
@@ -419,23 +419,24 @@ foldl2_maybe_stop_at_error_maybe_parallel(KeepGoing, MakeTarget, Targets,
MakeTarget, Targets, Success0, !.Info, !IO)
;
Success0 = yes
),
% Second pass (sequential).
(
Success0 = yes,
% Disable the `--rebuild' option during the sequential pass
% otherwise all the targets will be built a second time.
globals.io_lookup_bool_option(rebuild, Rebuild, !IO),
globals.io_set_option(rebuild, bool(no), !IO),
foldl2_maybe_stop_at_error(KeepGoing, MakeTarget, Targets, Success,
!Info, !IO),
globals.io_set_option(rebuild, bool(Rebuild), !IO)
;
Success0 = no,
Success = no
)
;
Success0 = yes
),
% Second pass (sequential).
(
Success0 = yes,
% Disable the `--rebuild' option during the sequential pass otherwise
% all the targets will be built a second time.
globals.io_lookup_bool_option(rebuild, Rebuild, !IO),
globals.io_set_option(rebuild, bool(no), !IO),
foldl2_maybe_stop_at_error(KeepGoing, MakeTarget, Targets, Success,
!Info, !IO),
globals.io_set_option(rebuild, bool(Rebuild), !IO)
;
Success0 = no,
Success = no
!Info, !IO)
).
:- pred do_parallel_foldl2(bool::in, int::in,