From 9963231e31a4c0501b8a81b4efd16c7be3fcddd3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 12 Nov 2014 09:16:54 +0100 Subject: [PATCH] xbps-src: only set --{build,host} if build_style is unset or gnu-configure. --- common/environment/configure/gnu-configure-args.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh index 846c9e99bb5..094870f88cb 100644 --- a/common/environment/configure/gnu-configure-args.sh +++ b/common/environment/configure/gnu-configure-args.sh @@ -2,6 +2,8 @@ if [ -z "$build_style" -o "$build_style" = "gnu-configure" ]; then export configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}" + . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh + export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET" fi if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then @@ -14,8 +16,6 @@ fi # Cross compilation vars if [ -z "$CROSS_BUILD" ]; then - . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh - export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET" return 0 fi