This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Two build != host fixes
- From: Eric Botcazou <ebotcazou at adacore dot com>
- To: Iain Sandoe <iain at codesourcery dot com>
- Cc: gcc-patches at gcc dot gnu dot org, Bernd Edlinger <bernd dot edlinger at hotmail dot de>, Alan Modra <amodra at gmail dot com>, Jakub Jelinek <jakub at redhat dot com>, DJ Delorie <dj at redhat dot com>
- Date: Wed, 11 Dec 2013 15:41:59 +0100
- Subject: Re: Two build != host fixes
- Authentication-results: sourceware.org; auth=none
- References: <DUB122-W49C1420F5ADBBBFF956A3EE4DD0 at phx dot gbl> <DUB122-W625D03C11B9F166A2223FE4DD0 at phx dot gbl> <DA15D71F-C9AD-41ED-BDE7-123AA4AC4F6C at codesourcery dot com>
> I have some more fixes for Ada cross-builds that Eric commented on but need
> a little more work - will try to re-test this evening and re-post tomorrow.
It's also PR ada/55946. Would mind trying the attached patch?
--
Eric Botcazou
Index: gnattools/Makefile.in
===================================================================
--- gnattools/Makefile.in (revision 205881)
+++ gnattools/Makefile.in (working copy)
@@ -24,6 +24,8 @@ srcdir = @srcdir@
libdir = @libdir@
build = @build@
target = @target@
+host = @host@
+host_alias= @host_alias@
prefix = @prefix@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -92,6 +94,7 @@ TOOLS_FLAGS_TO_PASS_RE= \
"CC=../../xgcc -B../../" \
"CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \
"CFLAGS=$(CFLAGS)" \
+ "LDFLAGS=$(LDFLAGS)" \
"ADAFLAGS=$(ADAFLAGS)" \
"ADA_CFLAGS=$(ADA_CFLAGS)" \
"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
@@ -105,6 +108,22 @@ TOOLS_FLAGS_TO_PASS_RE= \
"TOOLSCASE=cross"
# Variables for gnattools, cross
+ifeq ($(build), $(host))
+ GNATMAKE_FOR_HOST=gnatmake
+ GNATLINK_FOR_HOST=gnatlink
+ GNATBIND_FOR_HOST=gnatbind
+ GNATLS_FOR_HOST=gnatls
+else
+ GNATMAKE_FOR_HOST=$(host_alias)-gnatmake
+ GNATLINK_FOR_HOST=$(host_alias)-gnatlink
+ GNATBIND_FOR_HOST=$(host_alias)-gnatbind
+ GNATLS_FOR_HOST=$(host_alias)-gnatls
+endif
+
+# Put the host RTS dir first in the PATH to hide the default runtime
+# files that are among the sources
+RTS_DIR:=$(strip $(subst \,/,$(shell $(GNATLS_FOR_HOST) -v | grep adalib )))
+
TOOLS_FLAGS_TO_PASS_CROSS= \
"CC=$(CC)" \
"CXX=$(CXX)" \
@@ -117,9 +136,9 @@ TOOLS_FLAGS_TO_PASS_CROSS= \
"exeext=$(exeext)" \
"fsrcdir=$(fsrcdir)" \
"srcdir=$(fsrcdir)" \
- "GNATMAKE=gnatmake" \
- "GNATLINK=gnatlink" \
- "GNATBIND=gnatbind" \
+ "GNATMAKE=$(GNATMAKE_FOR_HOST)" \
+ "GNATLINK=$(GNATLINK_FOR_HOST)" \
+ "GNATBIND=$(GNATBIND_FOR_HOST)" \
"TOOLSCASE=cross" \
"LIBGNAT="
@@ -188,11 +207,6 @@ regnattools: $(GCC_DIR)/stamp-gnatlib-rt
$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
$(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
-# For cross builds of gnattools,
-# put the host RTS dir first in the PATH to hide the default runtime
-# files that are among the sources
-# FIXME: This should be done in configure.
-RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib )))
gnattools-cross: $(GCC_DIR)/stamp-tools
# gnattools1-re
$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
Index: gcc/ada/gcc-interface/Make-lang.in
===================================================================
--- gcc/ada/gcc-interface/Make-lang.in (revision 205881)
+++ gcc/ada/gcc-interface/Make-lang.in (working copy)
@@ -658,7 +658,7 @@ ada.tags: force
ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb
-$(MKDIR) ada/doctools
$(CP) $^ ada/doctools
- cd ada/doctools && $(GNATMAKE) -q xgnatugn
+ cd ada/doctools && gnatmake -q xgnatugn
# Note that doc/gnat_ugn.texi and doc/projects.texi do not depend on
# xgnatugn being built so we can distribute a pregenerated doc/gnat_ugn.info