diff options
| author | Mats Wichmann <mats@linux.com> | 2019-05-04 16:00:32 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-05-04 16:11:16 (GMT) |
| commit | 242c19a47df0ff3ff7cef7c6e60d3aa3db2c1039 (patch) | |
| tree | 8a4393f14febe4ab83bb4400f6b0c475b5bc8d4b | |
| parent | cb83cf38c8f8c17bfc06610b20e01ef23c19a368 (diff) | |
| download | SCons-242c19a47df0ff3ff7cef7c6e60d3aa3db2c1039.zip SCons-242c19a47df0ff3ff7cef7c6e60d3aa3db2c1039.tar.gz SCons-242c19a47df0ff3ff7cef7c6e60d3aa3db2c1039.tar.bz2 | |
[PR #3363] doc update for added flags
Needed a doc regen to pick up the change.
Signed-off-by: Mats Wichmann <mats@linux.com>
| -rw-r--r-- | doc/generated/examples/troubleshoot_Dump_2.xml | 2 | ||||
| -rw-r--r-- | doc/generated/examples/troubleshoot_stacktrace_2.xml | 4 | ||||
| -rw-r--r-- | doc/generated/functions.gen | 3 | ||||
| -rwxr-xr-x | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Environment.xml | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml index 8a7979b..d83fb94 100644 --- a/doc/generated/examples/troubleshoot_Dump_2.xml +++ b/doc/generated/examples/troubleshoot_Dump_2.xml @@ -80,7 +80,7 @@ scons: Reading SConscript files ... 'SHCXX': '$CXX', 'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM","$SHCXXCOMSTR")}', 'SHCXXFLAGS': ['$CXXFLAGS'], - 'SHELL': None, + 'SHELL': 'command', 'SHLIBPREFIX': '', 'SHLIBSUFFIX': '.dll', 'SHOBJPREFIX': '$OBJPREFIX', diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml index 76cfc1a..2d88ae8 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_2.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml @@ -4,10 +4,10 @@ scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'. scons: internal stack trace: File "bootstrap/src/engine/SCons/Job.py", line 199, in start task.prepare() - File "bootstrap/src/engine/SCons/Script/Main.py", line 177, in prepare + File "bootstrap/src/engine/SCons/Script/Main.py", line 190, in prepare return SCons.Taskmaster.OutOfDateTask.prepare(self) File "bootstrap/src/engine/SCons/Taskmaster.py", line 198, in prepare executor.prepare() - File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare + File "bootstrap/src/engine/SCons/Executor.py", line 431, in prepare raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0])) </screen> diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen index 9fc9d4b..505f1ad 100644 --- a/doc/generated/functions.gen +++ b/doc/generated/functions.gen @@ -2941,6 +2941,9 @@ and added to the following construction variables: -frameworkdir= FRAMEWORKPATH -include CCFLAGS -isysroot CCFLAGS, LINKFLAGS +-isystem CCFLAGS +-iquote CCFLAGS +-idirafter CCFLAGS -I CPPPATH -l LIBS -L LIBPATH diff --git a/src/CHANGES.txt b/src/CHANGES.txt index e5688f7..2d62291 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -62,8 +62,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER prone to races. Add a hack to the PY2 version (from Issue #3351) to be less prone to a race in the check for old-style cache. - Fix coding error in docbook tool only exercised when using python lxml - - Recognize two additional GNU compiler header directory options: - -iquote and -idirafter. + - Recognize two additional GNU compiler header directory options in + ParseFlags: -iquote and -idirafter. RELEASE 3.0.5 - Mon, 26 Mar 2019 15:04:42 -0700 diff --git a/src/engine/SCons/Environment.xml b/src/engine/SCons/Environment.xml index 324096f..0a41e2a 100644 --- a/src/engine/SCons/Environment.xml +++ b/src/engine/SCons/Environment.xml @@ -2294,6 +2294,9 @@ and added to the following construction variables: -frameworkdir= FRAMEWORKPATH -include CCFLAGS -isysroot CCFLAGS, LINKFLAGS +-isystem CCFLAGS +-iquote CCFLAGS +-idirafter CCFLAGS -I CPPPATH -l LIBS -L LIBPATH |