OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #30251 - nodakai:patch-1, r=pnkfelix

Browse Source 
On some weird setup where $SHELL is a relative path (can happen under GNU
Screen,) `file -L "$BIN_TO_PROBE"` fails and $CFG_CPUTYPE is wrongly set to
i686.  We should not only check its string value but also permission on
filesystem.
This commit is contained in:
Steve Klabnik 2015-12-23 18:09:11 -05:00
commit 8759f1f4cf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -521,16 +521,19 @@ then
# if configure is running in an interactive bash shell. /usr/bin/env # if configure is running in an interactive bash shell. /usr/bin/env
# exists *everywhere*. # exists *everywhere*.
BIN_TO_PROBE="$SHELL" BIN_TO_PROBE="$SHELL"
if [ -z "$BIN_TO_PROBE" -a -e "/usr/bin/env" ]; then if [ ! -r "$BIN_TO_PROBE" ]; then
if [ -r "/usr/bin/env" ]; then
BIN_TO_PROBE="/usr/bin/env" BIN_TO_PROBE="/usr/bin/env"
else
warn "Cannot check if the userland is i686 or x86_64"
fi
fi fi
if [ -n "$BIN_TO_PROBE" ]; then
file -L "$BIN_TO_PROBE" | grep -q "x86[_-]64" file -L "$BIN_TO_PROBE" | grep -q "x86[_-]64"
if [ $? != 0 ]; then if [ $? != 0 ]; then
msg "i686 userland on x86_64 Linux kernel"
CFG_CPUTYPE=i686 CFG_CPUTYPE=i686
fi fi
fi fi
fi
DEFAULT_BUILD="${CFG_CPUTYPE}-${CFG_OSTYPE}" DEFAULT_BUILD="${CFG_CPUTYPE}-${CFG_OSTYPE}"