From c607156f995fc3f5142e58456524e9d34c3f0c31 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 27 May 2009 19:51:15 +0000 Subject: Makefile.in (LINKER, [...]): Define. ./: * Makefile.in (LINKER, LINKER_FLAGS): Define. (LINKER_FOR_BUILD, BUILD_LINKERFLAGS): Define. (ALL_LINKERFLAGS): Define. (xgcc$(exeext)): Change $(COMPILER) to $(LINKER). (cpp$(exeext), cc1-dummy$(exeext), cc1$(exeext)): Likewise. (collect2$(exeext), mips-tfile, mips-tdump): Likewise. (gcov$(exeext), gcov-dump$(exeext)): Likewise. (build/gen%$(build_exeext)): Change $(COMPILER_FOR_BUILD) to $(LINKER_FOR_BUILD). (build/gcov-iov$(build_exeext)): Likewise. cp/: * Make-lang.in (g++$(exeext)): Change $(COMPILER) to $(LINKER). (cc1plus-dummy$(exeext), cc1plus$(exeext)): Likewise. fortran/: * Make-lang.in (gfortran$(exeext)): Change $(COMPILER) to $(LINKER). (f951$(exeext)): Likewise. java/: * Make-lang.in ($(XGCJ)$(exeext)): Change $(COMPILER) to $(LINKER). (jc1$(exeext), jcf-dump$(exeext), jvgenmain$(exeext)): Likewise. objc/: * Make-lang.in (cc1obj-dummy$(exeext)): Change $(COMPILER) to $(LINKER). (cc1obj$(exeext)): Likewise. objcp/: * Make-lang.in (cc1objplus-dummy$(exeext)): Change $(COMPILER) to $(LINKER). (cc1objplus$(exeext)): Likewise. From-SVN: r147927 --- gcc/java/Make-lang.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gcc/java/Make-lang.in') diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 159cd06..263ddc3 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -65,7 +65,7 @@ jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) coretypes.h $(TM_H) \ # Create the compiler driver for $(XGCJ). $(XGCJ)$(exeext): $(GCC_OBJS) jvspec.o java/jcf-path.o version.o \ prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS) - $(COMPILER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o $@ $(GCC_OBJS) \ + $(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ $(GCC_OBJS) \ jvspec.o java/jcf-path.o prefix.o intl.o \ version.o $(EXTRA_GCC_OBJS) $(LIBS) @@ -100,17 +100,17 @@ jvspec.o-warn = -Wno-error jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS) attribs.o rm -f $@ - $(COMPILER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o $@ \ + $(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ $(JAVA_OBJS) $(BACKEND) $(ZLIB) $(LIBICONV) $(LIBS) attribs.o $(BACKENDLIBS) jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIBDEPS) rm -f $@ - $(COMPILER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ + $(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) rm -f $@ - $(COMPILER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) \ + $(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) \ $(LIBS) # -- cgit v1.1