From 4a941c6dcede7764f33d7408b53e1c19ac8b414e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 11 Jun 2014 09:24:44 +0200 Subject: [PATCH] environment/gnu-configure-args: only set --libdir if build_style unset or gnu-configure. --- common/environment/configure/gnu-configure-args.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh index 878cacca62e..19136728d96 100644 --- a/common/environment/configure/gnu-configure-args.sh +++ b/common/environment/configure/gnu-configure-args.sh @@ -7,7 +7,9 @@ fi if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then # on x86 use /usr/lib32 as libdir, but just as fake directory, # because /usr/lib32 is a symlink to /usr/lib in void. - export configure_args+=" --libdir=/usr/lib32" + if [ -z "$build_style" -o "$build_style" = "gnu-configure" ]; then + export configure_args+=" --libdir=/usr/lib32" + fi fi # Cross compilation vars