From aa0fca163e1736e158fd3922cbbc31b85c9c7df7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 1 May 2021 17:16:23 -0400 Subject: sim: add support for build-time ar & ranlib This is needed when building for a target whose ar & ranlib are incompatible with the current build system. For example, building for Windows on a Linux system. Then manually import the automake rule for libigen.a, but tweak the tool variables to use the FOR_BUILD variants. --- sim/iq2000/ChangeLog | 4 ++++ sim/iq2000/configure | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'sim/iq2000') diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 6798553..550be28 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,7 @@ +2021-05-04 Mike Frysinger + + * configure: Regenerate. + 2021-05-01 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/iq2000/configure b/sim/iq2000/configure index ecefb97..6dd888c 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -688,7 +688,9 @@ RANLIB AR LDFLAGS_FOR_BUILD CFLAGS_FOR_BUILD +RANLIB_FOR_BUILD CC_FOR_BUILD +AR_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM @@ -6862,11 +6864,15 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h if test "x$cross_compiling" = "xno"; then + : "${AR_FOR_BUILD:=\$(AR)}" : "${CC_FOR_BUILD:=\$(CC)}" + : "${RANLIB_FOR_BUILD:=\$(RANLIB)}" : "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}" : "${LDFLAGS_FOR_BUILD:=\$(LDFLAGS)}" else + : "${AR_FOR_BUILD:=ar}" : "${CC_FOR_BUILD:=gcc}" + : "${RANLIB_FOR_BUILD:=ranlib}" : "${CFLAGS_FOR_BUILD:=-g -O}" : "${LDLFAGS_FOR_BUILD:=}" fi @@ -6875,6 +6881,8 @@ fi + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11200,7 +11208,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11203 "configure" +#line 11211 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11306,7 +11314,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11309 "configure" +#line 11317 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -- cgit v1.1