diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2011-10-28 07:13:44 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2011-10-28 07:13:44 +0000 |
| commit | 0de82be51731d649414f86d09f9cd3d672df8dda (patch) | |
| tree | d873b7368731bc70b9faa90a668c03f962ba575f /gcc/ada/gcc-interface | |
| parent | d303c992f61f5f94aaa314e914b1e27280940de2 (diff) | |
| download | gcc-0de82be51731d649414f86d09f9cd3d672df8dda.zip gcc-0de82be51731d649414f86d09f9cd3d672df8dda.tar.gz gcc-0de82be51731d649414f86d09f9cd3d672df8dda.tar.bz2 | |
re PR ada/50842 (gnatmake fails to link in stage3 with undefined symbol _iconv_close)
PR ada/50842
* gcc-interface/Makefile.in (SYMDEPS): Delete.
(LIBICONV): New variable.
(LIBICONV_DEP): Likewise.
(LIBS): Add $(LIBICONV).
(LIBDEPS): Add $(LIBICONV_DEP).
(EXTRA_GNATTOOLS_OBJS): Merge into...
(TOOLS_LIBS): ...this. Add $(LIBICONV).
From-SVN: r180605
Diffstat (limited to 'gcc/ada/gcc-interface')
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index f2247d0..990a698 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -121,7 +121,6 @@ THREAD_KIND = native THREADSLIB = GMEM_LIB = MISCLIB = -SYMDEPS = $(LIBINTL_DEP) OUTPUT_OPTION = @OUTPUT_OPTION@ objext = .o @@ -175,13 +174,13 @@ top_builddir = ../.. LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ +# Character encoding conversion library. +LIBICONV = @LIBICONV@ +LIBICONV_DEP = @LIBICONV_DEP@ + # Any system libraries needed just for GNAT. SYSLIBS = @GNAT_LIBEXC@ -# List of extra object files linked in with various programs. -EXTRA_GNATTOOLS_OBJS = ../../libcommon-target.a ../../libcommon.a \ - ../../../libcpp/libcpp.a - # List extra gnattools EXTRA_GNATTOOLS = @@ -242,11 +241,13 @@ LIBIBERTY = ../../libiberty/libiberty.a # How to link with both our special library facilities # and the system's installed libraries. -LIBS = $(LIBINTL) $(LIBIBERTY) $(SYSLIBS) -LIBDEPS = $(LIBINTL_DEP) $(LIBIBERTY) +LIBS = $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(SYSLIBS) +LIBDEPS = $(LIBINTL_DEP) $(LIBICONV_DEP) $(LIBIBERTY) # Default is no TGT_LIB; one might be passed down or something TGT_LIB = -TOOLS_LIBS = $(EXTRA_GNATTOOLS_OBJS) targext.o link.o $(LIBGNAT) $(LIBINTL) ../../../libiberty/libiberty.a $(SYSLIBS) $(TGT_LIB) +TOOLS_LIBS = targext.o link.o ../../libcommon-target.a ../../libcommon.a \ + ../../../libcpp/libcpp.a $(LIBGNAT) $(LIBINTL) $(LIBICONV) \ + ../../../libiberty/libiberty.a $(SYSLIBS) $(TGT_LIB) # Convert the target variable into a space separated list of architecture, # manufacturer, and operating system and assign each of those to its own |