summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorBrian Fraser <fraserbn@gmail.com>2014-01-03 01:32:09 -0300
committerBrian Fraser <fraserbn@gmail.com>2014-01-13 23:52:01 -0300
commit3ea734f88d1b94acf863a54bbbe478ed0a1d00ad (patch)
tree132fd6d3212a0fc66b866fae069400a90c5b5065 /Configure
parent6488598c75e86a843b3bf444ccc3433d79098816 (diff)
downloadperl-3ea734f88d1b94acf863a54bbbe478ed0a1d00ad.tar.gz
Configure, sysroot: failing to guess usrinc needn't be fatal
Previously, if we failed to guess usrinc, incpth, or libpth and were cross-compiling, Configure would've bailed out immediately. This commit makes it more lenient if using -Dsysroot; in case of failure it will now warn, but Configure will continue as usual; this is because the defaults for those variables will now use sysroot, so they have a higher chance of being accurate.
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure8
1 files changed, 7 insertions, 1 deletions
diff --git a/Configure b/Configure
index 3e80e852cc..8350ba2a20 100755
--- a/Configure
+++ b/Configure
@@ -4715,7 +4715,13 @@ case "$ccname" in
*) echo "Using usrinc $usrinc." >&4 ;;
esac
case "$croak" in
- y) echo "Cannot continue, aborting." >&4; exit 1 ;;
+ y)
+ if test "X$sysroot" = X; then
+ echo "Cannot continue, aborting." >&4; exit 1
+ else
+ echo "Cross-compiling using sysroot $sysroot, failing to guess inc/lib paths is not fatal" >&4
+ fi
+ ;;
esac
;;
esac