summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2017-08-15 07:20:20 (GMT)
committerRussel Winder <russel@winder.org.uk>2017-08-15 07:20:20 (GMT)
commite77ff3a91273d7fa5f7c440049ea76043b9bceb2 (patch)
tree7e446329442ed1a629edf6477a9bdb90560cf9ce /src
parent060cedbd03a5e3cf30ad1668d6d2d32e5be2255f (diff)
parent8bfb071d974edae91cde09bd64f4a2b9673e1364 (diff)
downloadSCons-e77ff3a91273d7fa5f7c440049ea76043b9bceb2.zip
SCons-e77ff3a91273d7fa5f7c440049ea76043b9bceb2.tar.gz
SCons-e77ff3a91273d7fa5f7c440049ea76043b9bceb2.tar.bz2
Merge in mainline.
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b0e88c7..dd92ce1 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -74,7 +74,7 @@ may cause rebuilds. In no case should rebuilds not happen.
From Paweł Tomulik:
- Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jennes
(https://pairlist4.pair.net/pipermail/scons-users/2016-May/004893.html).
- An error was causing “-Wl,Bsymbolic” being added to linker's command-line
+ An error was causing "-Wl,Bsymbolic" being added to linker's command-line
even when there was no specified value in LDMODULEVERSION and thus no
need for the flags to be specified.
- Added LoadableModule to the list of global functions (DefaultEnvironment