Do not use --host/build in GNU configure scripts by default.
--HG-- extra : convert_revision : c0125387213850e66e0c6e0b2a720b19a5798fb2
This commit is contained in:
parent
c5389d7521
commit
ad20e91144
2 changed files with 5 additions and 6 deletions
|
@ -13,6 +13,11 @@ for bin in gcc g++ cpp ar as ranlib ld strip; do
|
||||||
done
|
done
|
||||||
|
|
||||||
SAVE_PATH="$PATH"
|
SAVE_PATH="$PATH"
|
||||||
|
if [ "$xbps_machine" = "x86_64" ]; then
|
||||||
|
XBPS_CROSS_HOST="x86_64-unknown-linux-gnu"
|
||||||
|
else
|
||||||
|
XBPS_CROSS_HOST="$xbps_machine-pc-linux-gnu"
|
||||||
|
fi
|
||||||
|
|
||||||
cross_compile_setvars()
|
cross_compile_setvars()
|
||||||
{
|
{
|
||||||
|
|
6
xbps.sh
6
xbps.sh
|
@ -32,7 +32,6 @@ trap "echo && exit 1" INT QUIT
|
||||||
: ${progname:=$(basename $0)}
|
: ${progname:=$(basename $0)}
|
||||||
: ${fetch_cmd:=wget}
|
: ${fetch_cmd:=wget}
|
||||||
: ${xbps_machine:=$(uname -m)}
|
: ${xbps_machine:=$(uname -m)}
|
||||||
: ${XBPS_CROSS_HOST:=$xbps_machine-pc-linux-gnu}
|
|
||||||
|
|
||||||
usage()
|
usage()
|
||||||
{
|
{
|
||||||
|
@ -694,11 +693,6 @@ configure_src_phase()
|
||||||
if [ -n "$cross_compiler" ]; then
|
if [ -n "$cross_compiler" ]; then
|
||||||
. $XBPS_HELPERSDIR/cross-compilation.sh
|
. $XBPS_HELPERSDIR/cross-compilation.sh
|
||||||
cross_compile_setvars
|
cross_compile_setvars
|
||||||
else
|
|
||||||
if [ "$build_style" = "gnu_configure" ]; then
|
|
||||||
configure_args="$configure_args --host=$XBPS_CROSS_HOST"
|
|
||||||
configure_args="$configure_args --build=$XBPS_CROSS_HOST"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run pre_configure helpers.
|
# Run pre_configure helpers.
|
||||||
|
|
Loading…
Reference in a new issue