diff options
author | Jeff Law <law@gcc.gnu.org> | 2015-07-24 12:20:44 -0600 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 2015-07-24 12:20:44 -0600 |
commit | 6b1786aa65f71d94362d38ada4bf96b6841a59cb (patch) | |
tree | 96bb0ed7351cd7b40e9303e38db7d0fc7f3aa2cf /gcc/configure.ac | |
parent | 525a825bc6fedc3a5d0c5311098ad55e830e8ac6 (diff) | |
download | gcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.zip gcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.tar.gz gcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.tar.bz2 |
re PR other/66259 (Combined gcc and binutils build from git-master fails, with gas/as-new not existing)
PR other/66259
* config-ml.in: Reflects renaming of configure.in to configure.ac
* configure: Likewise
* configure.ac: Likewise
boehm-gc/
PR other/66259
* Makefile.direct: Reflects renaming of configure.in to configure.ac
* Makefile.dist: Likewise
* version.h: Likewise
* doc/README: Likewise
config/
PR other/66259
* gettext.m4: Reflects renaming of configure.in to configure.ac
* po.m4: Likewise
* stdint.m4: Likewise
* tcl.m4: Likewise
gcc/
PR other/66259
* acinclude.m4: Reflects renaming of configure.in to configure.ac
* configure: Likewise
* configure.ac: Likewise
* doc/install.texi: Likewise
* doc/tm.texi: Likewise
* doc/tm.texi.in: Likewise
gcc/ada/
PR other/66259
* prj-nmsc.adb: Reflects renaming of configure.in to configure.ac
* gcc-interface/Makefile.in: Likewise
intl/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
libjava/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
libjava/classpath
PR other/66259
* INSTALL: Reflects renaming of configure.in to configure.ac
* ltconfig: Likewise
* missing: Likewise
* m4/ac_prog_javac.m4: Likewise
* m4/ac_prog/javac_works.m4: Likewise
* resource/META-INF/mimetypes.default: Likewise
libjava/libltdl
PR other/66259
* THREADS: Reflects renaming of configure.in to configure.ac
liboffloadmic/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
From-SVN: r226183
Diffstat (limited to 'gcc/configure.ac')
-rw-r--r-- | gcc/configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/configure.ac b/gcc/configure.ac index 326bb59..3359f10 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2091,7 +2091,7 @@ m4_pattern_allow([AS_FOR_TARGET])dnl AS_VAR_SET_IF(gcc_cv_as,, [ if test -x "$DEFAULT_ASSEMBLER"; then gcc_cv_as="$DEFAULT_ASSEMBLER" -elif test -f $gcc_cv_as_gas_srcdir/configure.in \ +elif test -f $gcc_cv_as_gas_srcdir/configure.ac \ && test -f ../gas/Makefile \ && test x$build = x$host; then gcc_cv_as=../gas/as-new$build_exeext @@ -2180,7 +2180,7 @@ elif test $install_gold_as_default = yes \ && test -f ../gold/Makefile \ && test x$build = x$host; then gcc_cv_ld=../gold/ld-new$build_exeext -elif test -f $gcc_cv_ld_gld_srcdir/configure.in \ +elif test -f $gcc_cv_ld_gld_srcdir/configure.ac \ && test -f ../ld/Makefile \ && test x$build = x$host; then gcc_cv_ld=../ld/ld-new$build_exeext @@ -2244,7 +2244,7 @@ if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext \ elif test "$ld_is_gold" = yes; then in_tree_ld_is_elf=yes fi - for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in + for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.ac $gcc_cv_ld_gld_srcdir/Makefile.in do changequote(,)dnl gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f` @@ -2277,7 +2277,7 @@ AC_SUBST(ORIGINAL_LD_GOLD_FOR_TARGET) # Figure out what nm we will be using. gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils AS_VAR_SET_IF(gcc_cv_nm,, [ -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then gcc_cv_nm=../binutils/nm-new$build_exeext @@ -2309,7 +2309,7 @@ esac # Figure out what objdump we will be using. AS_VAR_SET_IF(gcc_cv_objdump,, [ -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. @@ -2334,7 +2334,7 @@ fi # Figure out what readelf we will be using. AS_VAR_SET_IF(gcc_cv_readelf,, [ -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. |