workaround to a bug where pwd / -W returns a path with slashes.

This commit is contained in:
Ivan Nedrehagen
2015-03-25 14:31:16 +01:00
parent 26b5e1af7e
commit fd42db911c
2 changed files with 8 additions and 8 deletions

View File

@@ -12,28 +12,28 @@ diff --git a/check/check-sysroot b/check/check-sysroot
index 0820206..d03d1c7 100755
--- a/check/check-sysroot
+++ b/check/check-sysroot
@@ -6,6 +6,11 @@ set -e
@@ -6,6 +6,12 @@ set -e
export PKG_CONFIG_SYSROOT_DIR=/sysroot
+# MSYS mangles / paths to its own root in windows format. This probably
+# means sysroot doesn't work there, but match what pkg-config passes
+# back anyway.
+[ "x$OSTYPE" = "xmsys" ] && root=$(cd / && pwd -W) || root=
+root=${root%/}
+
RESULT=""
run_test --cflags simple
@@ -20,8 +25,8 @@ if [ "$list_indirect_deps" = yes ]; then
fi
run_test --libs --static simple
-RESULT="-I/sysroot/public-dep/include"
+RESULT="-I$root/sysroot/public-dep/include"
run_test --cflags public-dep
-RESULT="-L/sysroot/public-dep/lib -lpublic-dep"
+RESULT="-L$root/sysroot/public-dep/lib -lpublic-dep"
run_test --libs public-dep
-- 1.8.1.4

View File

@@ -27,7 +27,7 @@ md5sums=('aa3c86e67551adc3ac865160e34a2a0d'
'073729fca79eb7415a88eec68504dc92'
'a14107b8eb8640aac2e59798467128a3'
'a605f371133ea78af740109a2b690a69'
'2b5a8f14761eaee3ccc35d8d24aace9f'
'0824f3b39004b24168b98280160e4045'
'27602f99a978c28f963afe9313fd1604'
'e1b804a1b0a15e9af895f6fd92907f23'
'2ba25b1a52a48afa0d2e1b0e06aaa07c'