From 054f9adaa2c4f0c0ea7e4f2bdab123bfdc039072 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Wed, 25 Oct 1995 01:21:08 +0000 Subject: [PATCH] Tue Oct 24 18:19:09 1995 Jason Molenda (crash@phydeaux.cygnus.com) * Makefile.in (X11_LIB): Removed. (X11_FLAGS_TO_PASS): pass only X11_EXTRA_CFLAGS and X11_EXTRA_LIBS. * configure.in (host_makefile_frag): mh-aix & mh-sun removed. --- ChangeLog | 7 +++++++ Makefile.in | 28 ++++++++++++++++++++++------ configure.in | 3 --- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b48ef21d36..4fe495fd01e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Oct 24 18:19:09 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * Makefile.in (X11_LIB): Removed. + (X11_FLAGS_TO_PASS): pass only X11_EXTRA_CFLAGS and X11_EXTRA_LIBS. + + * configure.in (host_makefile_frag): mh-aix & mh-sun removed. + Sun Oct 22 13:04:42 1995 Michael Meissner * cfg-ml-com.in (powerpc*): Shorten some of the multilib directory diff --git a/Makefile.in b/Makefile.in index d963ec630b6..6c9b91c8e0a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -122,9 +122,6 @@ RUNTEST = `if [ -f $${srcroot}/dejagnu/runtest ] ; \ else echo runtest ; fi` -# libraries that may need to be augmented on a system-by-system basis -X11_LIB = -lX11 - # compilers to use to create programs which must be run in the build # environment. CC_FOR_BUILD = $(CC) @@ -204,6 +201,17 @@ AS_FOR_TARGET = ` \ fi; \ fi` +LD_FOR_TARGET = ` \ + if [ -f $$r/ld/ld.new ] ; then \ + echo $$r/ld/ld.new ; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(LD); \ + else \ + t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \ + fi; \ + fi` + DLLTOOL_FOR_TARGET = ` \ if [ -f $$r/binutils/dlltool ] ; then \ echo $$r/binutils/dlltool ; \ @@ -279,6 +287,7 @@ BASE_FLAGS_TO_PASS = \ "INSTALL_XFORM=$(INSTALL_XFORM)" \ "LDFLAGS=$(LDFLAGS)" \ "LEX=$(LEX)" \ + "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ "LIBCXXFLAGS=$(LIBCXXFLAGS)" \ @@ -313,10 +322,15 @@ FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) # Flags that are concerned with the location of the X11 include files # and library files +# +# NOTE: until the top-level is getting the values via autoconf, it only +# causes problems to have this top-level Makefile overriding the autoconf-set +# values in child directories. Only variables that don't conflict with +# autoconf'ed ones should be passed by X11_FLAGS_TO_PASS for now. +# X11_FLAGS_TO_PASS = \ - "X11_INCLUDE_FLAGS=$(X11_INCLUDE_FLAGS)" \ - "X11_LIB_FLAGS=$(X11_LIB_FLAGS)" \ - "X11_LIB=$(X11_LIB)" + 'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \ + 'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)' # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; the variables @@ -330,6 +344,7 @@ EXTRA_TARGET_FLAGS = \ 'CXX=$$(CXX_FOR_TARGET)' \ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ + 'LD=$$(LD_FOR_TARGET)' \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \ @@ -830,6 +845,7 @@ $(CONFIGURE_TARGET_MODULES): CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXX="$(CXX_FOR_TARGET)"; export CXX; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LD="$(LD_FOR_TARGET)"; export LD; \ NM="$(NM_FOR_TARGET)"; export NM; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ cd $${dir}; \ diff --git a/configure.in b/configure.in index 8e36e5a1fbc..8f5d5fbbc17 100644 --- a/configure.in +++ b/configure.in @@ -116,11 +116,8 @@ case "${host}" in i[345]86-*-go32*) host_makefile_frag=config/mh-go32 ;; i[345]86-*-win32) host_makefile_frag=config/mh-i386win32 ;; vax-*-ultrix2*) host_makefile_frag=config/mh-vaxult2 ;; - *-ibm-aix*) host_makefile_frag=config/mh-aix ;; - *-bull-bosx*) host_makefile_frag=config/mh-aix ;; *-*-solaris2*) host_makefile_frag=config/mh-solaris ;; m68k-sun-*) host_makefile_frag=config/mh-sun3 ;; - *-sun-*) host_makefile_frag=config/mh-sun ;; *-hp-hpux[78]*) host_makefile_frag=config/mh-hpux8 ;; *-hp-hpux*) host_makefile_frag=config/mh-hpux ;; *-*-hiux*) host_makefile_frag=config/mh-hpux ;; -- 2.30.2