From df6faf7954d8c5360809a6a91de4def068ee7e18 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Wed, 15 Apr 1998 12:41:32 +0000 Subject: [PATCH] Fix host/build confusion with gas and gnu_ld flags. * configure.in (gnu_ld): Rename to gnu_ld_flag before main loop. Set gnu_ld to gnu_ld_flag inside main loop. (gas): Likewise. From-SVN: r19230 --- gcc/ChangeLog | 6 ++++++ gcc/configure | 12 ++++++++---- gcc/configure.in | 12 ++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae81faff77c..26b7ea88d76 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 15 12:38:03 1998 Jim Wilson + + * configure.in (gnu_ld): Rename to gnu_ld_flag before main loop. + Set gnu_ld to gnu_ld_flag inside main loop. + (gas): Likewise. + Wed Apr 15 14:50:05 1998 Dave Brolley * toplev.c (compile_file): Call init_parse using new interface. diff --git a/gcc/configure b/gcc/configure index 3ae066fc168..b68a0c60c3c 100755 --- a/gcc/configure +++ b/gcc/configure @@ -556,9 +556,9 @@ copy=cp # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then withval="$with_gnu_ld" - gnu_ld="$with_gnu_ld" + gnu_ld_flag="$with_gnu_ld" else - gnu_ld=no + gnu_ld_flag=no fi @@ -566,9 +566,9 @@ fi # Check whether --with-gnu-as or --without-gnu-as was given. if test "${with_gnu_as+set}" = set; then withval="$with_gnu_as" - gas="$with_gnu_as" + gas_flag="$with_gnu_as" else - gas=no + gas_flag=no fi @@ -1935,6 +1935,10 @@ for machine in $build $host $target; do exeext= # Set this to control which thread package will be used. thread_file= + # Reinitialize these from the flag values every loop pass, since some + # configure entries modify them. + gas="$gas_flag" + gnu_ld="$gnu_ld_flag" # Set default cpu_type, tm_file and xm_file so it can be updated in # each machine entry. diff --git a/gcc/configure.in b/gcc/configure.in index 3930a1e9b33..1387ed0e130 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -34,14 +34,14 @@ copy=cp # With GNU ld AC_ARG_WITH(gnu-ld, [ --with-gnu-ld arrange to work with GNU ld.], -gnu_ld="$with_gnu_ld", -gnu_ld=no) +gnu_ld_flag="$with_gnu_ld", +gnu_ld_flag=no) # With GNU as AC_ARG_WITH(gnu-as, [ --with-gnu-as arrange to work with GNU as.], -gas="$with_gnu_as", -gas=no) +gas_flag="$with_gnu_as", +gas_flag=no) # With stabs AC_ARG_WITH(stabs, @@ -246,6 +246,10 @@ for machine in $build $host $target; do exeext= # Set this to control which thread package will be used. thread_file= + # Reinitialize these from the flag values every loop pass, since some + # configure entries modify them. + gas="$gas_flag" + gnu_ld="$gnu_ld_flag" # Set default cpu_type, tm_file and xm_file so it can be updated in # each machine entry. -- 2.30.2