diff options
| author | Richard Stallman <rms@gnu.org> | 1993-01-02 08:33:03 +0000 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 1993-01-02 08:33:03 +0000 |
| commit | b7b08dcde44e819d6d57bbd27e6c825907be0b39 (patch) | |
| tree | 767a49f77174f20f95cbd280750f97bd43db7c76 /gcc/Makefile.in | |
| parent | bb59f9a64b74aecc029b22f77662fa11b75da682 (diff) | |
| download | gcc-b7b08dcde44e819d6d57bbd27e6c825907be0b39.zip gcc-b7b08dcde44e819d6d57bbd27e6c825907be0b39.tar.gz gcc-b7b08dcde44e819d6d57bbd27e6c825907be0b39.tar.bz2 | |
(REAL_LD_NAME): New variable.
(collect2.o): Don't need STANDARD_STARTFILE_PREFIX, etc.
(install-cross-tools): Use REAL_LD_NAME instead of `ld' when linking
files from tooldir to libsubdir.
From-SVN: r3053
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index d3fa8cd..03ef85f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -233,6 +233,11 @@ GCC_PASSES=xgcc cc1 cpp $(EXTRA_PASSES) # to link anything. GCC_PARTS=$(GCC_PASSES) libgcc.a $(EXTRA_PROGRAMS) $(USE_COLLECT2) $(EXTRA_PARTS) +# Name of `ld' to link into the binary directory for a cross-compiler. +# If we are using collect2, this will be `gld', since `ld' is collect2. +# Otherwise it is `ld'. +REAL_LD_NAME=`if [ x$(USE_COLLECT2) = xld ]; then echo "gld"; else echo "ld"; fi` + # Directory to link to, when using the target `maketest'. DIR = ../gcc @@ -781,12 +786,9 @@ collect2 : collect2.o version.o $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o collect2 collect2.o version.o $(LIBS) collect2.o : collect2.c $(CONFIG_H) gstab.h - $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -DSTANDARD_STARTFILE_PREFIX=\"$(libdir)/\" \ - -DSTANDARD_BIN_PREFIX=\"$(bindir)/\" \ - -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \ - -DDEFAULT_TARGET_MACHINE=\"$(target)\" \ - -c `echo $(srcdir)/collect2.c | sed 's,^\./,,'` + $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ + -DTARGET_MACHINE=\"$(target)\" \ + -c `echo $(srcdir)/collect2.c | sed 's,^\./,,'` # Objectionable C language specific files. @@ -1385,7 +1387,7 @@ install-cross-tools: install-dir then \ if [ -d $(tooldir)/. ] ; \ then \ - for file in as ld ar nm ranlib; do \ + for file in as $(REAL_LD_NAME) ar nm ranlib; do \ if [ -f $(libsubdir)/$$file ] ; \ then true; \ else \ |