zig

commit d7e28f991d431ee6347f316f03a6f35a5692e095 (tree)
parent 643ab90ace52d6d752a12ece9d6a8655ca2ca596
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Mon, 23 Oct 2017 22:37:59 -0400

remove CXX ABI workaround

the actual solution is you must compile zig with the same
compiler that compiled llvm, lld, and clang.

reverts 8d60ffe314306e5295fb76338c6391e5fe986dea

Diffstat:
M
src/config.h.in
 | 
1
-
M
src/zig_llvm.cpp
 | 
11
++---------

2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/config.h.in b/src/config.h.in
@@ -20,7 +20,6 @@
 #define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@"
 
 #cmakedefine ZIG_EACH_LIB_RPATH
-#cmakedefine ZIG_LLVM_OLD_CXX_ABI
 
 // Only used for running tests before installing.
 #define ZIG_TEST_DIR "@CMAKE_SOURCE_DIR@/test"
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
@@ -5,15 +5,6 @@
  * See http://opensource.org/licenses/MIT
  */
 
-// This must go before all includes.
-#include "config.h"
-#if defined(ZIG_LLVM_OLD_CXX_ABI)
-#define _GLIBCXX_USE_CXX11_ABI 0
-#endif
-
-
-#include "zig_llvm.hpp"
-
 
 /*
  * The point of this file is to contain all the LLVM C++ API interaction so that:
@@ -22,6 +13,8 @@
  * 3. Prevent C++ from infecting the rest of the project.
  */
 
+#include "zig_llvm.hpp"
+
 #include <llvm/Analysis/TargetLibraryInfo.h>
 #include <llvm/Analysis/TargetTransformInfo.h>
 #include <llvm/IR/DIBuilder.h>