diff options
| author | Andrew Morrow <acm@mongodb.com> | 2021-05-13 17:23:07 (GMT) |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2021-05-13 17:50:17 (GMT) |
| commit | 3467ea5877718f0e31d1718c35fddb108a410d64 (patch) | |
| tree | 9b8ebd3293cc44906169c81b8630e47c7b95edbf | |
| parent | 2909e28730ab72930f923b55f860d554f3b5e216 (diff) | |
| download | SCons-3467ea5877718f0e31d1718c35fddb108a410d64.zip SCons-3467ea5877718f0e31d1718c35fddb108a410d64.tar.gz SCons-3467ea5877718f0e31d1718c35fddb108a410d64.tar.bz2 | |
3790 - Fix the failing test
| -rw-r--r-- | SCons/Defaults.py | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | test/CPPDEFINES/basic.py | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/SCons/Defaults.py b/SCons/Defaults.py index ba42a26..95a2e52 100644 --- a/SCons/Defaults.py +++ b/SCons/Defaults.py @@ -498,12 +498,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_list(processDefines(defs)), suffix, env) + return c(prefix, env.subst_list(processDefines(defs), target=target, source=source), suffix, env) class NullCmdGenerator: @@ -608,7 +608,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")}', diff --git a/test/CPPDEFINES/basic.py b/test/CPPDEFINES/basic.py index 176f543..176f543 100644..100755 --- a/test/CPPDEFINES/basic.py +++ b/test/CPPDEFINES/basic.py |