diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-03 18:01:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 18:01:22 +0200 |
| commit | a3bdb6c8d83d424da664ea8c4ee680a9b67e1b30 (patch) | |
| tree | 8672de67513b1971abcb9c5fb5b0337ddcf67184 /modules/mono | |
| parent | f5f7244a2b59de60b2c1c29346b2fe5ded2ae2d0 (diff) | |
| parent | b0d41847ed1e4cd9407dce0d26aaa09db656ec12 (diff) | |
Merge pull request #30277 from akien-mga/scons-cppdefines
SCons: Use CPPDEFINES instead of CPPFLAGS for pre-processor defines
Diffstat (limited to 'modules/mono')
| -rw-r--r-- | modules/mono/build_scripts/mono_configure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index c549640d61..733cdd168c 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -173,7 +173,7 @@ def configure(env, env_mono): if not mono_lib: raise RuntimeError('Could not find mono library in: ' + mono_lib_path) - env_mono.Append(CPPFLAGS=['-D_REENTRANT']) + env_mono.Append(CPPDEFINES=['_REENTRANT']) if mono_static: mono_lib_file = os.path.join(mono_lib_path, 'lib' + mono_lib + '.a') @@ -398,7 +398,7 @@ def configure_for_mono_version(env, mono_version): raise RuntimeError("Mono JIT compiler version not found; specify one manually with the 'MONO_VERSION' environment variable") print('Found Mono JIT compiler version: ' + str(mono_version)) if mono_version >= LooseVersion('5.12.0'): - env.Append(CPPFLAGS=['-DHAS_PENDING_EXCEPTIONS']) + env.Append(CPPDEFINES=['HAS_PENDING_EXCEPTIONS']) def pkgconfig_try_find_mono_root(mono_lib_names, sharedlib_ext): |