Commit d7e28f991d431ee6347f316f03a6f35a5692e095 | zig

author	Andrew Kelley <andrew@ziglang.org> 2017-10-23 22:37:59-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2017-10-23 22:37:59-04:00
log	d7e28f991d431ee6347f316f03a6f35a5692e095
tree	a05081f5e3dfd4b5a74aefd9ad3a26ba176aaed6
parent	643ab90ace52d6d752a12ece9d6a8655ca2ca596

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
- zig_llvm.cpp

src/config.h.in-1

...	...	@@ -20,7 +20,6 @@
20	20	#define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@"
21	21
22	22	#cmakedefine ZIG_EACH_LIB_RPATH
23		#cmakedefine ZIG_LLVM_OLD_CXX_ABI
24	23
25	24	// Only used for running tests before installing.
26	25	#define ZIG_TEST_DIR "@CMAKE_SOURCE_DIR@/test"

src/zig_llvm.cpp+2-9

...	...	@@ -5,15 +5,6 @@
5	5	* See http://opensource.org/licenses/MIT
6	6	*/
7	7
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
17	8
18	9	/*
19	10	* The point of this file is to contain all the LLVM C++ API interaction so that:
...	...	@@ -22,6 +13,8 @@
22	13	* 3. Prevent C++ from infecting the rest of the project.
23	14	*/
24	15
	16	#include "zig_llvm.hpp"
	17
25	18	#include <llvm/Analysis/TargetLibraryInfo.h>
26	19	#include <llvm/Analysis/TargetTransformInfo.h>
27	20	#include <llvm/IR/DIBuilder.h>