diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-02-02 11:09:18 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-02-02 11:09:18 (GMT) |
| commit | de84af3f318501b8a776cbc0b93e9aec5c85f819 (patch) | |
| tree | 1eaecbea1cc33ae0b13772342925475d25df6bc2 /src | |
| parent | 6a42327dfce9dba97ad9643b519e5c93907a45be (diff) | |
| parent | b7bf26899595e90e1cc6937fb18fd5702bec8d8d (diff) | |
| download | SCons-de84af3f318501b8a776cbc0b93e9aec5c85f819.zip SCons-de84af3f318501b8a776cbc0b93e9aec5c85f819.tar.gz SCons-de84af3f318501b8a776cbc0b93e9aec5c85f819.tar.bz2 | |
Commit merge from default.
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 c05682c..93bf387 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 eace84a..7107fde 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: |