Skip to content

Commit 63691c6

Browse files
committed
wrappers: Skip the clang-scan-deps wrapper script on Unix
The wrapper script no longer has any purpose on Unix. Just do a plain symlink to the clang-scan-deps tool. On Windows, the wrapper executable still is used to inject a default -target option, if the executable name doesn't contain a triple.
1 parent ff505bf commit 63691c6

File tree

2 files changed

+3
-66
lines changed

2 files changed

+3
-66
lines changed

install-wrappers.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,18 @@ if [ -n "$EXEEXT" ]; then
142142
# when invoked from outside of MSYS.
143143
CTW_SUFFIX=$EXEEXT
144144
CTW_LINK_SUFFIX=$EXEEXT
145+
CSDW=clang-scan-deps-wrapper$EXEEXT
145146
else
146147
CTW_SUFFIX=.sh
148+
CSDW=clang-scan-deps
147149
fi
148150
cd "$PREFIX/bin"
149151
for arch in $ARCHS; do
150152
for target_os in $TARGET_OSES; do
151153
for exec in clang clang++ gcc g++ c++ as; do
152154
ln -sf clang-target-wrapper$CTW_SUFFIX $arch-w64-$target_os-$exec$CTW_LINK_SUFFIX
153155
done
154-
ln -sf clang-scan-deps-wrapper$CTW_SUFFIX $arch-w64-$target_os-clang-scan-deps$CTW_LINK_SUFFIX
156+
ln -sf $CSDW $arch-w64-$target_os-clang-scan-deps$CTW_LINK_SUFFIX
155157
for exec in addr2line ar ranlib nm objcopy readelf size strings strip llvm-ar llvm-ranlib; do
156158
if [ -n "$EXEEXT" ]; then
157159
link_target=llvm-wrapper

wrappers/clang-scan-deps-wrapper.sh

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)