summaryrefslogtreecommitdiff
path: root/core/SCsub
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-04-24 16:49:12 +0200
committerRémi Verschelde <rverschelde@gmail.com>2019-04-24 16:57:58 +0200
commitc2a669a9f03e249fb4fca96a2adf63256eb8dfa2 (patch)
tree711bd1f6ed3b110ba56af20d6995fe615c3ccf0d /core/SCsub
parente1d16e722ec9742c3f92d20dc433d540339c36e6 (diff)
SCons: Review uses of CCFLAGS, CXXFLAGS and CPPFLAGS
Many contributors (me included) did not fully understand what CCFLAGS, CXXFLAGS and CPPFLAGS refer to exactly, and were thus not using them in the way they are intended to be. As per the SCons manual: https://www.scons.org/doc/HTML/scons-user/apa.html - CCFLAGS: General options that are passed to the C and C++ compilers. - CFLAGS: General options that are passed to the C compiler (C only; not C++). - CXXFLAGS: General options that are passed to the C++ compiler. By default, this includes the value of $CCFLAGS, so that setting $CCFLAGS affects both C and C++ compilation. - CPPFLAGS: User-specified C preprocessor options. These will be included in any command that uses the C preprocessor, including not just compilation of C and C++ source files [...], but also [...] Fortran [...] and [...] assembly language source file[s]. TL;DR: Compiler options go to CCFLAGS, unless they must be restricted to either C (CFLAGS) or C++ (CXXFLAGS). Preprocessor defines go to CPPFLAGS.
Diffstat (limited to 'core/SCsub')
-rw-r--r--core/SCsub4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/SCsub b/core/SCsub
index 00d0bcac24..d5be74a64f 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -129,10 +129,10 @@ if env['builtin_zstd']:
thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
env_thirdparty.Append(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
- env_thirdparty.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
+ env_thirdparty.Append(CPPFLAGS="-DZSTD_STATIC_LINKING_ONLY")
env.Append(CPPPATH=thirdparty_zstd_dir)
# Also needed in main env includes will trigger warnings
- env.Append(CCFLAGS="-DZSTD_STATIC_LINKING_ONLY")
+ env.Append(CPPFLAGS="-DZSTD_STATIC_LINKING_ONLY")
env_thirdparty.add_source_files(env.core_sources, thirdparty_zstd_sources)