From 41d0e46f2da2dee1a7882029797e4ce0a643a3a9 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 12 Aug 2019 22:30:57 +0200 Subject: [PATCH] Always use lists for `LIBS` in SCons This closes #31288. (cherry picked from commit 05daf5c78be6e6c2f6a74a129edd1c53826a9f8e) --- modules/mono/config.py | 6 +++--- platform/SCsub | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mono/config.py b/modules/mono/config.py index 6b88600c565..df7bdbdaad9 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -120,8 +120,8 @@ def configure(env): 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') @@ -131,7 +131,7 @@ def configure(env): 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 aa83154ee0c..61324cfb063 100644 --- a/platform/SCsub +++ b/platform/SCsub @@ -28,4 +28,4 @@ with open_utf8('register_platform_apis.gen.cpp', 'w') as f: platform_sources.append('register_platform_apis.gen.cpp') lib = env.add_library('platform', platform_sources) -env.Prepend(LIBS=lib) +env.Prepend(LIBS=[lib])