Message ID | 0988F838-B7AC-4382-B949-90F76F3F62C9@codesourcery.com |
---|---|
State | New |
Headers | show |
> With your blanket change to gnattools/Makefile, isn't it also reasonable to > apply the following? > > diff --git a/gcc/ada/gcc-interface/Make-lang.in > b/gcc/ada/gcc-interface/Make-lang.in index cd3676f..241571d 100644 > --- a/gcc/ada/gcc-interface/Make-lang.in > +++ b/gcc/ada/gcc-interface/Make-lang.in > @@ -152,12 +152,6 @@ ifeq ($(build), $(host)) > # This is a regular cross compiler. Use the native compiler to compile > # the tools. > > - # put the host RTS dir first in the PATH to hide the default runtime > - # files that are among the sources > - ifneq ($(findstring ada,$(LANGUAGES)),) > - RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib ))) > - endif > - > ADA_TOOLS_FLAGS_TO_PASS=\ > CC="$(CC)" \ > CXX="$(CXX)" \ > @@ -193,9 +187,6 @@ else > else > # This is a canadian cross. We should use a toolchain running on the > # build platform and targeting the host platform. > - ifneq ($(findstring ada,$(LANGUAGES)),) > - RTS_DIR:=$(strip $(subst \,/,$(shell $(GNATLS_FOR_HOST) -v | grep > adalib ))) - endif > ADA_TOOLS_FLAGS_TO_PASS=\ > CC="$(CC)" \ > CXX="$(CXX)" \ That's tempting indeed, but we still support the old --disable-libada and these bits are required to make it work.
On 12 Dec 2013, at 17:21, Eric Botcazou wrote: >> With your blanket change to gnattools/Makefile, isn't it also reasonable to >> apply the following? >> >> diff --git a/gcc/ada/gcc-interface/Make-lang.in >> b/gcc/ada/gcc-interface/Make-lang.in index cd3676f..241571d 100644 >> --- a/gcc/ada/gcc-interface/Make-lang.in >> +++ b/gcc/ada/gcc-interface/Make-lang.in >> @@ -152,12 +152,6 @@ ifeq ($(build), $(host)) >> # This is a regular cross compiler. Use the native compiler to compile >> # the tools. >> >> - # put the host RTS dir first in the PATH to hide the default runtime >> - # files that are among the sources >> - ifneq ($(findstring ada,$(LANGUAGES)),) >> - RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib ))) >> - endif >> - >> ADA_TOOLS_FLAGS_TO_PASS=\ >> CC="$(CC)" \ >> CXX="$(CXX)" \ >> @@ -193,9 +187,6 @@ else >> else >> # This is a canadian cross. We should use a toolchain running on the >> # build platform and targeting the host platform. >> - ifneq ($(findstring ada,$(LANGUAGES)),) >> - RTS_DIR:=$(strip $(subst \,/,$(shell $(GNATLS_FOR_HOST) -v | grep >> adalib ))) - endif >> ADA_TOOLS_FLAGS_TO_PASS=\ >> CC="$(CC)" \ >> CXX="$(CXX)" \ > > That's tempting indeed, but we still support the old --disable-libada and > these bits are required to make it work. ah. .. then does the second block need hoisting to bracket the two cases with host!=build? Iain
> .. then does the second block need hoisting to bracket the two cases with > host!=build? This code works fine so I don't think that we really need to do anything.
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index cd3676f..241571d 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -152,12 +152,6 @@ ifeq ($(build), $(host)) # This is a regular cross compiler. Use the native compiler to compile # the tools. - # put the host RTS dir first in the PATH to hide the default runtime - # files that are among the sources - ifneq ($(findstring ada,$(LANGUAGES)),) - RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib ))) - endif - ADA_TOOLS_FLAGS_TO_PASS=\ CC="$(CC)" \ CXX="$(CXX)" \ @@ -193,9 +187,6 @@ else else # This is a canadian cross. We should use a toolchain running on the # build platform and targeting the host platform. - ifneq ($(findstring ada,$(LANGUAGES)),) - RTS_DIR:=$(strip $(subst \,/,$(shell $(GNATLS_FOR_HOST) -v | grep adalib ))) - endif ADA_TOOLS_FLAGS_TO_PASS=\ CC="$(CC)" \ CXX="$(CXX)" \