diff --git a/install-wrappers.sh b/install-wrappers.sh index 578d76f..5114ff6 100755 --- a/install-wrappers.sh +++ b/install-wrappers.sh @@ -114,6 +114,7 @@ fi if [ -n "$EXEEXT" ]; then CLANG_MAJOR=$(basename $(echo $PREFIX/lib/clang/* | awk '{print $NF}') | cut -f 1 -d .) WRAPPER_FLAGS="$WRAPPER_FLAGS -municode -DCLANG=\"clang-$CLANG_MAJOR\"" + WRAPPER_FLAGS="$WRAPPER_FLAGS -DCLANG_SCAN_DEPS=\"clang-scan-deps-real\"" fi mkdir -p "$PREFIX/bin" @@ -171,6 +172,9 @@ if [ -n "$EXEEXT" ]; then if [ ! -L clang$EXEEXT ] && [ -f clang$EXEEXT ] && [ ! -f clang-$CLANG_MAJOR$EXEEXT ]; then mv clang$EXEEXT clang-$CLANG_MAJOR$EXEEXT fi + if [ ! -L clang-scan-deps$EXEEXT ] && [ -f clang-scan-deps$EXEEXT ] && [ ! -f clang-scan-deps-real$EXEEXT ]; then + mv clang-scan-deps$EXEEXT clang-scan-deps-real$EXEEXT + fi if [ -z "$HOST" ]; then HOST=$(./clang-$CLANG_MAJOR -dumpmachine | sed 's/-.*//')-w64-mingw32 fi @@ -179,7 +183,7 @@ if [ -n "$EXEEXT" ]; then # we are installing wrappers for. case $ARCHS in *$HOST_ARCH*) - for exec in clang clang++ gcc g++ c++ addr2line ar dlltool ranlib nm objcopy readelf size strings strip windres; do + for exec in clang clang++ gcc g++ c++ addr2line ar dlltool ranlib nm objcopy readelf size strings strip windres clang-scan-deps; do ln -sf $HOST-$exec$EXEEXT $exec$EXEEXT done for exec in cc c99 c11; do diff --git a/wrappers/clang-scan-deps-wrapper.c b/wrappers/clang-scan-deps-wrapper.c index 21f6b9f..11d467c 100644 --- a/wrappers/clang-scan-deps-wrapper.c +++ b/wrappers/clang-scan-deps-wrapper.c @@ -18,6 +18,9 @@ #include "native-wrapper.h" +#ifndef CLANG_SCAN_DEPS +#define CLANG_SCAN_DEPS "clang-scan-deps" +#endif #ifndef DEFAULT_TARGET #define DEFAULT_TARGET "x86_64-w64-mingw32" #endif @@ -29,7 +32,7 @@ int _tmain(int argc, TCHAR *argv[]) { int max_arg = argc + 3; const TCHAR **exec_argv = malloc((max_arg + 1) * sizeof(*exec_argv)); int arg = 0; - exec_argv[arg++] = concat(dir, _T("clang-scan-deps")); + exec_argv[arg++] = concat(dir, _T(CLANG_SCAN_DEPS)); // If changing this wrapper, change clang-scan-deps-wrapper.sh accordingly. int i = 1;