From 6134c35d95e59e2745e91d83eb73b12be9ea9b35 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 16 Apr 2014 17:35:59 +0200 Subject: [PATCH] mine: fixed to only use cross-compiler confopts and config.cache when cross-compiling --- archiver/mine/mine.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/archiver/mine/mine.conf b/archiver/mine/mine.conf index 18c7b3e20..0ac3fa59d 100644 --- a/archiver/mine/mine.conf +++ b/archiver/mine/mine.conf @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../mine/mine.conf +# Copyright (C) 2014 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -13,7 +14,11 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -makeopt="$makeopt CONFOPT=\"--build=\$arch_build --host=\$arch_target --cache-file=../config.cache\"" +if atstage cross; then + makeopt="$makeopt CONFOPT=\"--build=\$arch_build --host=\$arch_target --cache-file=../config.cache\"" + hook_add premake 5 "create_config_cache > config.cache" +fi + makeinstopt="$makeinstopt sysprefix=$root" if atstage native && [ -f $root/var/adm/packages/dialog ]; then @@ -22,7 +27,6 @@ if atstage native && [ -f $root/var/adm/packages/dialog ]; then else makeopt="$makeopt USE_GAS=0" makeinstopt="$makeinstopt USE_GAS=0" - hook_add premake 5 "create_config_cache > config.cache" fi var_append makeinstopt " " "prefix=$root/$prefix sysprefix=$root/"