From 61eaf3a0de862d54395bad630708032578f57b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 19 Apr 2018 00:52:35 +0300 Subject: [PATCH] Stop manually setting the sysroot Since clang SVN r330244, the one next to clang is preferred, even if a similar mingw gcc exists in the path. --- wrappers/clang-target-wrapper.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wrappers/clang-target-wrapper.sh b/wrappers/clang-target-wrapper.sh index 79e21b4..f01a3ea 100755 --- a/wrappers/clang-target-wrapper.sh +++ b/wrappers/clang-target-wrapper.sh @@ -13,7 +13,6 @@ g++) ;; esac ARCH=$(echo $TARGET | sed 's/-.*//') -SYSROOT="$(cd "$DIR"/../$TARGET && pwd)" case $ARCH in i686) # Dwarf is the default for i686, but currently there's an issue @@ -39,4 +38,4 @@ esac if [ -n "$CCACHE" ]; then CCACHE=ccache fi -$CCACHE $DIR/$EXE -target $TARGET -rtlib=compiler-rt -stdlib=libc++ -fuse-ld=lld --sysroot="$SYSROOT" $ARCH_FLAGS -Qunused-arguments "$@" +$CCACHE $DIR/$EXE -target $TARGET -rtlib=compiler-rt -stdlib=libc++ -fuse-ld=lld $ARCH_FLAGS -Qunused-arguments "$@"