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/osx | |
| 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/osx')
| -rw-r--r-- | platform/osx/detect.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 671efa216c..ea41479bb0 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -99,7 +99,6 @@ def configure(env): mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local") mpclangver = env["macports_clang"] env["CC"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang" - env["LINK"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++" env["CXX"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++" env["AR"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ar" env["RANLIB"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ranlib" @@ -134,12 +133,6 @@ def configure(env): env["AS"] = basecmd + "as" env.Append(CPPDEFINES=["__MACPORTS__"]) # hack to fix libvpx MM256_BROADCASTSI128_SI256 define - if env["CXX"] == "clang++": - # This should now work with clang++, re-enable if there are issues - # env.Append(CPPDEFINES=["TYPED_METHOD_BIND"]) - env["CC"] = "clang" - env["LINK"] = "clang++" - if env["use_ubsan"] or env["use_asan"] or env["use_tsan"]: env.extra_suffix += "s" |