From 0b38c5031127c011ba5d279a5ed6b8af970e0d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 25 Nov 2020 19:34:08 +0100 Subject: [PATCH] SCons: Do not define TYPED_METHOD_BIND on Linux/OSX with clang Port of #43862. --- platform/osx/detect.py | 5 ----- platform/server/detect.py | 2 -- platform/x11/detect.py | 2 -- 3 files changed, 9 deletions(-) diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 26517e308e5..baa48f90ead 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -132,11 +132,6 @@ def configure(env): env["AS"] = basecmd + "as" env.Append(CPPDEFINES=["__MACPORTS__"]) # hack to fix libvpx MM256_BROADCASTSI128_SI256 define - if env["CXX"] == "clang++": - 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" diff --git a/platform/server/detect.py b/platform/server/detect.py index 45c4d2ce99a..ea7001bbf47 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -93,8 +93,6 @@ def configure(env): if "clang++" not in os.path.basename(env["CXX"]): env["CC"] = "clang" env["CXX"] = "clang++" - env["LINK"] = "clang++" - env.Append(CPPDEFINES=["TYPED_METHOD_BIND"]) env.extra_suffix = ".llvm" + env.extra_suffix if env["use_ubsan"] or env["use_asan"] or env["use_lsan"] or env["use_tsan"]: diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 6df148a6704..28000b556c9 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -133,8 +133,6 @@ def configure(env): if "clang++" not in os.path.basename(env["CXX"]): env["CC"] = "clang" env["CXX"] = "clang++" - env["LINK"] = "clang++" - env.Append(CPPDEFINES=["TYPED_METHOD_BIND"]) env.extra_suffix = ".llvm" + env.extra_suffix if env["use_lld"]: