diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-10-23 22:37:59 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-10-23 22:37:59 -0400 |
| commit | d7e28f991d431ee6347f316f03a6f35a5692e095 (patch) | |
| tree | a05081f5e3dfd4b5a74aefd9ad3a26ba176aaed6 /src/zig_llvm.cpp | |
| parent | 643ab90ace52d6d752a12ece9d6a8655ca2ca596 (diff) | |
| download | zig-d7e28f991d431ee6347f316f03a6f35a5692e095.tar.gz zig-d7e28f991d431ee6347f316f03a6f35a5692e095.zip | |
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 (limited to 'src/zig_llvm.cpp')
| -rw-r--r-- | src/zig_llvm.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index f82b1d5423..0e1a067bc6 100644 --- 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> |