Author: ericwf
Date: Sun Nov 13 16:27:00 2016
New Revision: 286783
URL: http://llvm.org/viewvc/llvm-project?rev=286783&view=rev
Log:
Fix GCC libc++abi build
Modified:
libcxxabi/trunk/CMakeLists.txt
libcxxabi/trunk/test/lit.site.cfg.in
Modified: libcxxabi/trunk/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=286783&r1=286782&r2=286783&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Sun Nov 13 16:27:00 2016
@@ -249,6 +249,10 @@ add_target_flags_if(LIBCXXABI_GCC_TOOLCH
add_target_flags_if(LIBCXXABI_SYSROOT
"--sysroot=${LIBCXXABI_SYSROOT}")
+if (LIBCXXABI_TARGET_TRIPLE)
+ set(TARGET_TRIPLE "${LIBCXXABI_TARGET_TRIPLE}")
+endif()
+
# Configure compiler. Must happen after setting the target flags.
include(config-ix)
Modified: libcxxabi/trunk/test/lit.site.cfg.in
URL:
http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/lit.site.cfg.in?rev=286783&r1=286782&r2=286783&view=diff
==============================================================================
--- libcxxabi/trunk/test/lit.site.cfg.in (original)
+++ libcxxabi/trunk/test/lit.site.cfg.in Sun Nov 13 16:27:00 2016
@@ -18,6 +18,7 @@ config.enable_shared = "@LIBC
config.enable_exceptions = "@LIBCXXABI_ENABLE_EXCEPTIONS@"
config.host_triple = "@LLVM_HOST_TRIPLE@"
config.target_triple = "@TARGET_TRIPLE@"
+config.use_target = len("@LIBCXXABI_TARGET_TRIPLE@") > 0
# Let the main config do the real work.
lit_config.load_config(config, "@LIBCXXABI_SOURCE_DIR@/test/lit.cfg")
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
