diff --git a/install-wrappers.sh b/install-wrappers.sh index 35145ea..a7b98d3 100755 --- a/install-wrappers.sh +++ b/install-wrappers.sh @@ -123,6 +123,7 @@ fi mkdir -p "$PREFIX/bin" cp wrappers/*-wrapper.sh "$PREFIX/bin" +cp wrappers/mingw32-common.cfg $PREFIX/bin for arch in $ARCHS; do cp wrappers/$arch-w64-windows-gnu.cfg $PREFIX/bin done diff --git a/wrappers/aarch64-w64-windows-gnu.cfg b/wrappers/aarch64-w64-windows-gnu.cfg index 4859f92..2d68f2c 100644 --- a/wrappers/aarch64-w64-windows-gnu.cfg +++ b/wrappers/aarch64-w64-windows-gnu.cfg @@ -1,6 +1,3 @@ -target aarch64-w64-mingw32 --rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++ --fuse-ld=lld +@mingw32-common.cfg # SEH is the default for aarch64. diff --git a/wrappers/armv7-w64-windows-gnu.cfg b/wrappers/armv7-w64-windows-gnu.cfg index b8657f3..91747bf 100644 --- a/wrappers/armv7-w64-windows-gnu.cfg +++ b/wrappers/armv7-w64-windows-gnu.cfg @@ -1,6 +1,3 @@ -target armv7-w64-mingw32 --rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++ --fuse-ld=lld +@mingw32-common.cfg # SEH is the default for armv7. diff --git a/wrappers/i686-w64-windows-gnu.cfg b/wrappers/i686-w64-windows-gnu.cfg index ade386b..efc00bf 100644 --- a/wrappers/i686-w64-windows-gnu.cfg +++ b/wrappers/i686-w64-windows-gnu.cfg @@ -1,6 +1,3 @@ -target i686-w64-mingw32 --rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++ --fuse-ld=lld +@mingw32-common.cfg # Dwarf is the default for i686. diff --git a/wrappers/mingw32-common.cfg b/wrappers/mingw32-common.cfg new file mode 100644 index 0000000..f39559c --- /dev/null +++ b/wrappers/mingw32-common.cfg @@ -0,0 +1,4 @@ +-rtlib=compiler-rt +-unwindlib=libunwind +-stdlib=libc++ +-fuse-ld=lld diff --git a/wrappers/x86_64-w64-windows-gnu.cfg b/wrappers/x86_64-w64-windows-gnu.cfg index b74b620..0ced806 100644 --- a/wrappers/x86_64-w64-windows-gnu.cfg +++ b/wrappers/x86_64-w64-windows-gnu.cfg @@ -1,6 +1,3 @@ -target x86_64-w64-mingw32 --rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++ --fuse-ld=lld +@mingw32-common.cfg # SEH is the default for x86_64.