diff options
| author | Dmitry Goncharov <dgoncharov@users.sf.net> | 2022-11-27 15:40:28 -0500 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2022-11-28 10:50:55 -0500 |
| commit | 6164608900ad5cc882d4d4bf1b7341d45d743bdf (patch) | |
| tree | 2cbea5c531d42a9e30817d92f335894c18d3d586 /tests | |
| parent | a99183ed2b8bfc474be16e42dad38d09b06cd69b (diff) | |
| download | make-git-6164608900ad5cc882d4d4bf1b7341d45d743bdf.tar.gz | |
[SV 63417] Ensure global .NOTINTERMEDIATE disables all intermediates
Fix .NOTINTERMEDIATE without prerequisites to disable intermediate
status for all targets.
* src/makeint.h: Declare extern no_intermediates.
* src/main.c: Add global definition of no_intermediates.
* src/file.c: Remove static no_intermediates to use global variable.
(remove_intermediates): Check no_intermediates.
* src/implicit.c (pattern_search): For a file found by implicit search
set file->notintermediate if no_intermediates is set.
* src/remake.c (update_file_1): Don't set file->secondary for a
pre-existing file if no_intermediates is set. The check for
no_intermediates here is redundant, but won't hurt: keep it in case
things change so that it matters.
* tests/scripts/targets/NOTINTERMEDIATE: Fix a test.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scripts/targets/NOTINTERMEDIATE | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/scripts/targets/NOTINTERMEDIATE b/tests/scripts/targets/NOTINTERMEDIATE index e4690b12..a24c4f7d 100644 --- a/tests/scripts/targets/NOTINTERMEDIATE +++ b/tests/scripts/targets/NOTINTERMEDIATE @@ -36,7 +36,6 @@ hello.z: # Test 4. .NOTINTERMEDIATE without prerequisites makes everything # notintermediate. -unlink('hello.z'); run_make_test(q! hello.z: %.z: %.x; touch $@ @@ -112,8 +111,6 @@ hello.z: .SECONDARY: !, '', "touch hello.z\n"); - - unlink('hello.z'); # This tells the test driver that the perl test script executed properly. 1; |