From 0cd8b27b567823c6dafe6adeabc067068d907f4a Mon Sep 17 00:00:00 2001 From: Erik <35656626+SeleckyErik@users.noreply.github.com> Date: Sat, 17 Nov 2018 18:04:08 +0100 Subject: [PATCH] SCons: Corrects $LIBSUFFIXES environment variable for Windows Maxes only .lib to be recoginzed as a valid input extension for linker on Windows. Closes issue #23769. --- SConstruct | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 628aac42afb..8b7b95a6002 100644 --- a/SConstruct +++ b/SConstruct @@ -425,8 +425,13 @@ if selected_platform in platform_list: # (SH)LIBSUFFIX will be used for our own built libraries # LIBSUFFIXES contains LIBSUFFIX and SHLIBSUFFIX by default, # so we need to append the default suffixes to keep the ability - # to link against thirdparty libraries (.a, .so, .dll, etc.). - env["LIBSUFFIXES"] += [env["LIBSUFFIX"], env["SHLIBSUFFIX"]] + # to link against thirdparty libraries (.a, .so, .lib, etc.). + if os.name == "nt": + # On Windows, only static libraries and import libraries can be + # statically linked - both using .lib extension + env["LIBSUFFIXES"] += [env["LIBSUFFIX"]] + else: + env["LIBSUFFIXES"] += [env["LIBSUFFIX"], env["SHLIBSUFFIX"]] env["LIBSUFFIX"] = suffix + env["LIBSUFFIX"] env["SHLIBSUFFIX"] = suffix + env["SHLIBSUFFIX"]