diff options
author | Ray Donnelly <mingw.android@gmail.com> | 2013-02-19 21:54:36 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-22 09:26:05 +0100 |
commit | bb842bb0d53cb43a06672802f8098ddd4d0f9950 (patch) | |
tree | 774774803eb10b66f5e0d923ee343055ac16ccfc /configure | |
parent | 4f14b42f7dc289cd73a5e7aa934d6052c708bac3 (diff) |
Fix DEFAULT_LIBDIRS detection on Windows
Must use ; as the path delimiter instead of :
Change-Id: I549e1652ef5bbae09c8fddec3e83ac9f52cec3a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -382,7 +382,9 @@ if [ -d /System/Library/Frameworks/Carbon.framework ]; then PLATFORM_MAC=maybe fi BUILD_ON_MSYS=no +HOST_DIRLIST_SEP=":" if [ "$OSTYPE" = "msys" ]; then + HOST_DIRLIST_SEP=";" BUILD_ON_MSYS=yes fi @@ -2736,7 +2738,7 @@ fi # auto-detect default include and library search paths gccout=`$TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null` libdirs=`echo "$gccout" | sed -n -e 's/^LIBRARY_PATH=\(.*\)/\1/p'` -DEFAULT_LIBDIRS=`IFS=:; for i in $libdirs; do test -d "$i" && cd "$i" && pwd; done | sort -u` +DEFAULT_LIBDIRS=`IFS=${HOST_DIRLIST_SEP}; for i in $libdirs; do test -d "$i" && cd "$i" && pwd; done | sort -u` DEFAULT_INCDIRS=`echo "$gccout" | awk ' /^End of search/ { yup=0 } / \(framework directory\)$/ { next } |