summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/fp_setup_windows_toolchain.m47
1 files changed, 7 insertions, 0 deletions
diff --git a/m4/fp_setup_windows_toolchain.m4 b/m4/fp_setup_windows_toolchain.m4
index 79a6ac6531..5fdac70113 100644
--- a/m4/fp_setup_windows_toolchain.m4
+++ b/m4/fp_setup_windows_toolchain.m4
@@ -78,6 +78,7 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[
# for the runtime, libc++ and libc++abi for the C++ standard library
# implementation, and libunwind for C++ unwinding.
mingwbin="$hardtop/inplace/mingw/bin/"
+ mingwlib="$hardtop/inplace/mingw/lib/"
CC="${mingwbin}clang.exe"
CXX="${mingwbin}clang++.exe"
@@ -94,6 +95,12 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[
CONF_GCC_LINKER_OPTS_STAGE1="-fuse-ld=lld $cflags"
CONF_GCC_LINKER_OPTS_STAGE2="-fuse-ld=lld $cflags"
+ # N.BOn Windows we can't easily dynamically-link against libc++ since there is
+ # no RPATH support, meaning that the loader will have no way of finding our
+ # libc++.dll
+ CXX_STD_LIB_LIBS=":libc++.a :libc++abi.a"
+ CXX_STD_LIB_LIB_DIRS="\$topdir"
+
LD="${mingwbin}ld.lld.exe"
NM="${mingwbin}llvm-nm.exe"
AR="${mingwbin}llvm-ar.exe"