authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-10-23 22:37:59-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-10-23 22:37:59-04:00
logd7e28f991d431ee6347f316f03a6f35a5692e095
treea05081f5e3dfd4b5a74aefd9ad3a26ba176aaed6
parent643ab90ace52d6d752a12ece9d6a8655ca2ca596

remove CXX ABI workaround

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

2 files changed, 2 insertions(+), 10 deletions(-)

src/config.h.in-1
...@@ -20,7 +20,6 @@...@@ -20,7 +20,6 @@
20#define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@"20#define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@"
2121
22#cmakedefine ZIG_EACH_LIB_RPATH22#cmakedefine ZIG_EACH_LIB_RPATH
23#cmakedefine ZIG_LLVM_OLD_CXX_ABI
2423
25// Only used for running tests before installing.24// Only used for running tests before installing.
26#define ZIG_TEST_DIR "@CMAKE_SOURCE_DIR@/test"25#define ZIG_TEST_DIR "@CMAKE_SOURCE_DIR@/test"
src/zig_llvm.cpp+2-9
...@@ -5,15 +5,6 @@...@@ -5,15 +5,6 @@
5 * See http://opensource.org/licenses/MIT5 * See http://opensource.org/licenses/MIT
6 */6 */
77
8// This must go before all includes.
9#include "config.h"
10#if defined(ZIG_LLVM_OLD_CXX_ABI)
11#define _GLIBCXX_USE_CXX11_ABI 0
12#endif
13
14
15#include "zig_llvm.hpp"
16
178
18/*9/*
19 * The point of this file is to contain all the LLVM C++ API interaction so that:10 * The point of this file is to contain all the LLVM C++ API interaction so that:
...@@ -22,6 +13,8 @@...@@ -22,6 +13,8 @@
22 * 3. Prevent C++ from infecting the rest of the project.13 * 3. Prevent C++ from infecting the rest of the project.
23 */14 */
2415
16#include "zig_llvm.hpp"
17
25#include <llvm/Analysis/TargetLibraryInfo.h>18#include <llvm/Analysis/TargetLibraryInfo.h>
26#include <llvm/Analysis/TargetTransformInfo.h>19#include <llvm/Analysis/TargetTransformInfo.h>
27#include <llvm/IR/DIBuilder.h>20#include <llvm/IR/DIBuilder.h>