diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-19 20:43:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 20:43:25 +0100 |
| commit | f69339c2c259bec6f5145da4a3d5c89bfe51653f (patch) | |
| tree | 28a1cf44223abfa201b8eddfa4e050594e6bea4b /platform/windows/detect.py | |
| parent | 71f53a5ba3656bb21056ffb292f9a89f3ea33824 (diff) | |
| parent | 2e4bff1cfea3843953a176656490339305a2c779 (diff) | |
Merge pull request #43692 from akien-mga/scons-leave-link-alone
SCons: Remove unnecessary $LINK overrides
Diffstat (limited to 'platform/windows/detect.py')
| -rw-r--r-- | platform/windows/detect.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 934314b2f2..e0b2a52014 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -383,18 +383,17 @@ def configure_mingw(env): if env["use_llvm"]: env["CC"] = mingw_prefix + "clang" - env["AS"] = mingw_prefix + "as" env["CXX"] = mingw_prefix + "clang++" + env["AS"] = mingw_prefix + "as" env["AR"] = mingw_prefix + "ar" env["RANLIB"] = mingw_prefix + "ranlib" - env["LINK"] = mingw_prefix + "clang++" else: env["CC"] = mingw_prefix + "gcc" - env["AS"] = mingw_prefix + "as" env["CXX"] = mingw_prefix + "g++" + env["AS"] = mingw_prefix + "as" env["AR"] = mingw_prefix + "gcc-ar" env["RANLIB"] = mingw_prefix + "gcc-ranlib" - env["LINK"] = mingw_prefix + "g++" + env["x86_libtheora_opt_gcc"] = True if env["use_lto"]: |