diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-13 12:32:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 12:32:57 +0200 |
| commit | 5f1dce435471473642209123c42c5c730776bb54 (patch) | |
| tree | 47fc77cd668692d0404ec5ebf890c581f0f0e0ae | |
| parent | 4403744ef97dd3584173ef7bf5108650ed1eff25 (diff) | |
| parent | 05daf5c78be6e6c2f6a74a129edd1c53826a9f8e (diff) | |
Merge pull request #31336 from Calinou/scons-libs-use-lists
Always use lists for `LIBS` in SCons
| -rw-r--r-- | modules/mono/build_scripts/mono_configure.py | 6 | ||||
| -rw-r--r-- | platform/SCsub | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index 9f0eb58896..f751719531 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -113,8 +113,8 @@ def configure(env, env_mono): else: env.Append(LINKFLAGS=os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)) - env.Append(LIBS='psapi') - env.Append(LIBS='version') + env.Append(LIBS=['psapi']) + env.Append(LIBS=['version']) else: mono_lib_name = find_file_in_dir(mono_lib_path, mono_lib_names, extension='.lib') @@ -124,7 +124,7 @@ def configure(env, env_mono): if env.msvc: env.Append(LINKFLAGS=mono_lib_name + Environment()['LIBSUFFIX']) else: - env.Append(LIBS=mono_lib_name) + env.Append(LIBS=[mono_lib_name]) mono_bin_path = os.path.join(mono_root, 'bin') diff --git a/platform/SCsub b/platform/SCsub index 20c89ae8c6..38bab59d74 100644 --- a/platform/SCsub +++ b/platform/SCsub @@ -29,4 +29,4 @@ with open_utf8('register_platform_apis.gen.cpp', 'w') as f: env.add_source_files(env.platform_sources, 'register_platform_apis.gen.cpp') lib = env.add_library('platform', env.platform_sources) -env.Prepend(LIBS=lib) +env.Prepend(LIBS=[lib]) |