diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-05 20:37:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-05 20:37:45 +0100 |
| commit | db49f35ab8d2bbcf5b97a58b8a2eff064b942881 (patch) | |
| tree | 49ad34615e0c7ae865285ee9c0f513431dcea872 /SConstruct | |
| parent | 380ee87e800e44b5e930d784dfb8aeadddf637f3 (diff) | |
SCons: Fix usage of LD when we meant LINK
Also made LINK and CXXFLAGS configurable as command line options.
Note that LINK currently expects the *compiler* that will be used
for linking and will call its configured linker behind the scenes
(so g++, clang++, etc., not ld.gold). See #15364 for details.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 88b29695cb..9fced81f9c 100644 --- a/SConstruct +++ b/SConstruct @@ -189,10 +189,12 @@ opts.Add(BoolVariable('builtin_zlib', "Use the builtin zlib library", True)) opts.Add(BoolVariable('builtin_zstd', "Use the builtin zstd library", True)) opts.Add(BoolVariable('no_editor_splash', "Don't use the custom splash screen for the editor", False)) -# Environment setup +# Compilation environment setup opts.Add("CXX", "C++ compiler") opts.Add("CC", "C compiler") -opts.Add("CCFLAGS", "Custom flags for the C and C++ compilers") +opts.Add("LINK", "Linker") +opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers") +opts.Add("CXXFLAGS", "Custom flags for the C++ compiler") opts.Add("CFLAGS", "Custom flags for the C compiler") opts.Add("LINKFLAGS", "Custom flags for the linker") |