diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-07-24 11:09:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-24 11:09:35 +0200 |
commit | 6b363c612e306f30b711723795b4ed07944f7a0d (patch) | |
tree | c15ae5a08768d24d4d93e16c11a2d8e41b00b9cf | |
parent | bfe52fc30a626012437c325b58587c8b65e6f8a2 (diff) | |
parent | 8bbf455f1e9bde96f813758b8ce2e00598868f9a (diff) |
Merge pull request #20380 from akien-mga/scons-libsuffixes
SCons: Keep default platform lib extensions in LIBSUFFIXES
-rw-r--r-- | SConstruct | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 08c5b6d34f..1135f7a3bd 100644 --- a/SConstruct +++ b/SConstruct @@ -409,6 +409,11 @@ if selected_platform in platform_list: env["PROGSUFFIX"] = suffix + env.module_version_string + env["PROGSUFFIX"] env["OBJSUFFIX"] = suffix + env["OBJSUFFIX"] + # (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"]] env["LIBSUFFIX"] = suffix + env["LIBSUFFIX"] env["SHLIBSUFFIX"] = suffix + env["SHLIBSUFFIX"] |