فهرست منبع

SCons: Do not define TYPED_METHOD_BIND on Linux/OSX with clang

Port of #43862.
Rémi Verschelde 4 سال پیش
والد
کامیت
0b38c50311
3فایلهای تغییر یافته به همراه0 افزوده شده و 9 حذف شده
  1. 0 5
      platform/osx/detect.py
  2. 0 2
      platform/server/detect.py
  3. 0 2
      platform/x11/detect.py

+ 0 - 5
platform/osx/detect.py

@@ -132,11 +132,6 @@ def configure(env):
         env["AS"] = basecmd + "as"
         env["AS"] = basecmd + "as"
         env.Append(CPPDEFINES=["__MACPORTS__"])  # hack to fix libvpx MM256_BROADCASTSI128_SI256 define
         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"]:
     if env["use_ubsan"] or env["use_asan"] or env["use_tsan"]:
         env.extra_suffix += "s"
         env.extra_suffix += "s"
 
 

+ 0 - 2
platform/server/detect.py

@@ -93,8 +93,6 @@ def configure(env):
         if "clang++" not in os.path.basename(env["CXX"]):
         if "clang++" not in os.path.basename(env["CXX"]):
             env["CC"] = "clang"
             env["CC"] = "clang"
             env["CXX"] = "clang++"
             env["CXX"] = "clang++"
-            env["LINK"] = "clang++"
-        env.Append(CPPDEFINES=["TYPED_METHOD_BIND"])
         env.extra_suffix = ".llvm" + env.extra_suffix
         env.extra_suffix = ".llvm" + env.extra_suffix
 
 
     if env["use_ubsan"] or env["use_asan"] or env["use_lsan"] or env["use_tsan"]:
     if env["use_ubsan"] or env["use_asan"] or env["use_lsan"] or env["use_tsan"]:

+ 0 - 2
platform/x11/detect.py

@@ -133,8 +133,6 @@ def configure(env):
         if "clang++" not in os.path.basename(env["CXX"]):
         if "clang++" not in os.path.basename(env["CXX"]):
             env["CC"] = "clang"
             env["CC"] = "clang"
             env["CXX"] = "clang++"
             env["CXX"] = "clang++"
-            env["LINK"] = "clang++"
-        env.Append(CPPDEFINES=["TYPED_METHOD_BIND"])
         env.extra_suffix = ".llvm" + env.extra_suffix
         env.extra_suffix = ".llvm" + env.extra_suffix
 
 
     if env["use_lld"]:
     if env["use_lld"]: