diff options
| author | Anthony Green <green@redhat.com> | 2001-02-15 13:55:34 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2001-02-15 13:55:34 +0000 |
| commit | 85b99cbe643d85e0ab23513f1a284f52644c6235 (patch) | |
| tree | 34304a71ce07fe2b98e6e9c4d47972b62867bdd4 | |
| parent | 8b2f4063e29b45fc7b73a8f7bbd1424340310d24 (diff) | |
| download | gcc-85b99cbe643d85e0ab23513f1a284f52644c6235.zip gcc-85b99cbe643d85e0ab23513f1a284f52644c6235.tar.gz gcc-85b99cbe643d85e0ab23513f1a284f52644c6235.tar.bz2 | |
configure: Introduce GCJ_FOR_TARGET.
2001-02-15 Anthony Green <green@redhat.com>
* configure: Introduce GCJ_FOR_TARGET.
* configure.in: Ditto.
* Makefile.in: Ditto.
From-SVN: r39718
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | configure.in | 11 |
3 files changed, 20 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2001-02-15 Anthony Green <green@redhat.com> + + * configure: Introduce GCJ_FOR_TARGET. + * configure.in: Ditto. + * Makefile.in: Ditto. + 2001-02-13 Andreas Schwab <schwab@suse.de> * MAINTAINERS: Update mail address. diff --git a/Makefile.in b/Makefile.in index 24182f9..9c62b3a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -220,6 +220,7 @@ FLAGS_FOR_TARGET = CC_FOR_TARGET = CHILL_FOR_TARGET = CXX_FOR_TARGET = +GCJ_FOR_TARGET = # If GCC_FOR_TARGET is not overriden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to @@ -333,6 +334,7 @@ BASE_FLAGS_TO_PASS = \ "CHILLFLAGS=$(CHILLFLAGS)" \ "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \ "CHILL_LIB=$(CHILL_LIB)" \ + "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \ "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ "CXXFLAGS=$(CXXFLAGS)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ @@ -1280,6 +1282,7 @@ $(CONFIGURE_TARGET_MODULES): CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXX="$(CXX_FOR_TARGET)"; export CXX; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ LD="$(LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ diff --git a/configure.in b/configure.in index 1b8d95f..1b313fa 100644 --- a/configure.in +++ b/configure.in @@ -1412,6 +1412,16 @@ case $CHILL_FOR_TARGET in *) CHILL_FOR_TARGET=$CHILL_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;; esac +if test "x${GCJ_FOR_TARGET+set}" = xset; then + : +elif test -d ${topsrcdir}/gcc; then + GCJ_FOR_TARGET='$$r/gcc/gcj -B$$r/gcc/' +elif test "$host" = "$target"; then + GCJ_FOR_TARGET='gcj' +else + GCJ_FOR_TARGET=`echo gcj | sed -e 's/x/x/' ${program_transform_name}` +fi + if test "x${CXX_FOR_TARGET+set}" = xset; then : elif test -d ${topsrcdir}/gcc; then @@ -1433,6 +1443,7 @@ sed -e "s:^TARGET_CONFIGDIRS[ ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" -e "s%^FLAGS_FOR_TARGET[ ]*=.*$%FLAGS_FOR_TARGET = ${FLAGS_FOR_TARGET}%" \ -e "s%^CC_FOR_TARGET[ ]*=.*$%CC_FOR_TARGET = ${CC_FOR_TARGET}%" \ -e "s%^CHILL_FOR_TARGET[ ]*=.*$%CHILL_FOR_TARGET = ${CHILL_FOR_TARGET}%" \ + -e "s%^GCJ_FOR_TARGET[ ]*=.*$%GCJ_FOR_TARGET = ${GCJ_FOR_TARGET}%" \ -e "s%^CXX_FOR_TARGET[ ]*=.*$%CXX_FOR_TARGET = ${qCXX_FOR_TARGET}%" \ -e "s%^TARGET_SUBDIR[ ]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \ -e "s%^gxx_include_dir[ ]*=.*$%gxx_include_dir=${gxx_include_dir}%" \ |