diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2021-06-17 09:08:40 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-21 15:14:31 +0000 |
| commit | e706abcecab992d5b2bf7f1806a90bd92e860c2d (patch) | |
| tree | 2a792c3fc0b925f04681ec825e20d3cb41f66c71 /src/third_party/scons-3.1.2 | |
| parent | bd1ea07226c0dd3b68725da0daf1a20b896a04b2 (diff) | |
| download | mongo-e706abcecab992d5b2bf7f1806a90bd92e860c2d.tar.gz | |
SERVER-57395 Cherry-pick upstream SCons fix for use of target and source in generators in CPPDEFINES
See https://github.com/SCons/scons/pull/3949 and https://github.com/SCons/scons/issues/3790
Diffstat (limited to 'src/third_party/scons-3.1.2')
| -rw-r--r-- | src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Defaults.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Defaults.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Defaults.py index c39c4176475..118356d1b54 100644 --- a/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Defaults.py +++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Defaults.py @@ -492,12 +492,12 @@ def processDefines(defs): return l -def _defines(prefix, defs, suffix, env, c=_concat_ixes): +def _defines(prefix, defs, suffix, env, target, source, c=_concat_ixes): """A wrapper around _concat_ixes that turns a list or string into a list of C preprocessor command-line definitions. """ - return c(prefix, env.subst_path(processDefines(defs)), suffix, env) + return c(prefix, env.subst_path(processDefines(defs), target=target, source=source), suffix, env) class NullCmdGenerator(object): @@ -574,7 +574,7 @@ ConstructionEnvironment = { '_LIBFLAGS' : '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}', '_LIBDIRFLAGS' : '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)', '_CPPINCFLAGS' : '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)', - '_CPPDEFFLAGS' : '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}', + '_CPPDEFFLAGS' : '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__, TARGET, SOURCE)}', '__libversionflags' : __libversionflags, '__SHLIBVERSIONFLAGS' : '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}', |