diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-19 09:33:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 09:33:32 +0100 |
| commit | 5738c92b3971c85e396f9f27608083588539f9fc (patch) | |
| tree | 275fc88c217d3172cfde4ddcefcffc5b27fef72c /SConstruct | |
| parent | 877f574b30b05db8b43326472ca93fcbfb119ab3 (diff) | |
| parent | 0cd8b27b567823c6dafe6adeabc067068d907f4a (diff) | |
Merge pull request #23770 from SeleckyErik/issue-23769
SCons: Corrects $LIBSUFFIXES environment variable for Windows
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 628aac42af..8b7b95a600 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"] |