26 lines
1.5 KiB
Diff
26 lines
1.5 KiB
Diff
diff --git a/build_llvm.py b/build_llvm.py
|
|
index aee0a9f1..5e1c3557 100644
|
|
--- a/build_llvm.py
|
|
+++ b/build_llvm.py
|
|
@@ -171,7 +171,6 @@ def build_llvm_clang_from_source_for_arch(args, arch: str, llvm_source: str) ->
|
|
"-D", "LLVM_INCLUDE_TESTS=FALSE",
|
|
"-D", "LLVM_INCLUDE_TOOLS=TRUE", # Needed by Clang
|
|
"-D", "LLVM_INCLUDE_UTILS=FALSE",
|
|
- "-D", f"CMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 {abi_version}", # The pre-C++11 ABI is still the default on the CentOS 7 toolchain
|
|
"-D", f"CMAKE_INSTALL_PREFIX={install_path}",
|
|
"-D", f"LLVM_HOST_TRIPLE={host_triple}",
|
|
"-D", f"CMAKE_OSX_ARCHITECTURES={osx_architectures}",
|
|
diff --git a/warp/build_dll.py b/warp/build_dll.py
|
|
index 2218ff13..2354f69f 100644
|
|
--- a/warp/build_dll.py
|
|
+++ b/warp/build_dll.py
|
|
@@ -417,7 +417,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
|
|
else:
|
|
version = ""
|
|
|
|
- cpp_flags = f'-Werror -Wuninitialized {version} --std=c++17 -fno-rtti -D{cuda_enabled} -D{mathdx_enabled} -D{cuda_compat_enabled} -fPIC -fvisibility=hidden -D_GLIBCXX_USE_CXX11_ABI=0 -I"{native_dir}" {includes} '
|
|
+ cpp_flags = f'-Werror -Wuninitialized {version} --std=c++17 -fno-rtti -D{cuda_enabled} -D{mathdx_enabled} -D{cuda_compat_enabled} -fPIC -fvisibility=hidden -I"{native_dir}" {includes} '
|
|
|
|
if mode == "debug":
|
|
cpp_flags += "-O0 -g -D_DEBUG -DWP_ENABLE_DEBUG=1 -fkeep-inline-functions"
|