diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-01-26 16:19:45 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-01-26 16:19:45 (GMT) |
| commit | b7bf26899595e90e1cc6937fb18fd5702bec8d8d (patch) | |
| tree | cea8759fb2828a43d09d5cc540fd2739a20b5b2d /src | |
| parent | 6cc2ad09d86e6da5812485b0e50a820e2560b31b (diff) | |
| parent | 04ffc9290157c8643f25404b6469b423589ee72d (diff) | |
| download | SCons-b7bf26899595e90e1cc6937fb18fd5702bec8d8d.zip SCons-b7bf26899595e90e1cc6937fb18fd5702bec8d8d.tar.gz SCons-b7bf26899595e90e1cc6937fb18fd5702bec8d8d.tar.bz2 | |
Merged in bdbaddog/scons (pull request #298)
fix for tigris bug # 2622 - AlwaysBuild / MSVC regression
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Executor.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index f59eaaf..dc8a281 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -22,6 +22,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER From William Deegan: - Add better messaging when two environments have different actions for the same target (Bug #2024) + - Fix issue only with MSVC and Always build where targets + marked AlwaysBuild wouldn't make it into CHANGED_SOURCES + and thus yield an empty compile command line. (Bug #2622) + From Jakub Pola: - Intel Compiler 2016 (Linux/Mac) update for tool directories. diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py index 71671bf..b6d4cb6 100644 --- a/src/engine/SCons/Executor.py +++ b/src/engine/SCons/Executor.py @@ -217,7 +217,9 @@ class Executor(object): us = [] ut = [] for b in self.batches: - if b.targets[0].is_up_to_date(): + # don't add targets marked always build to unchanged lists + # add to changed list as they always need to build + if not b.targets[0].always_build and b.targets[0].is_up_to_date(): us.extend(list(map(rfile, b.sources))) ut.extend(b.targets) else: |