Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.5/400-ecjx-host-cc.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jul 12 23:52:24 2011 +0200 (2011-07-12)
branch1.11
changeset 2558 b7317d2fe0e9
parent 1545 431001e537ca
permissions -rw-r--r--
scripts, cc/gcc: do not fail on existing symlinks or build.log

If the user builds a toolchain over an existing one, so, without removing
CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
build.log.

This can also happen (for build.log) if the user first ran in download-
or extract-only.

Patch (with no SoB) originally from:
Phil Wilshire <phil.wilshire@overturenetworks.com>

Modified by me as it did not apply cleanly.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3)
nyet@1545 
     1
 
diff -ur gcc-4.3.4-orig/libjava/Makefile.in gcc-4.3.4/libjava/Makefile.in
nyet@1545 
     2
 
--- gcc-4.3.4-orig/libjava/Makefile.in	2009-08-04 04:12:27.000000000 -0700
nyet@1545 
     3
 
+++ gcc-4.3.4/libjava/Makefile.in	2009-09-23 22:03:15.750951483 -0700
nyet@1545 
     4
 
@@ -8874,6 +8874,9 @@
nyet@1545 
     5
 
 ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES)
nyet@1545 
     6
 
 	@rm -f ecjx$(EXEEXT)
nyet@1545 
     7
 
 	$(ecjx_LINK) $(ecjx_LDFLAGS) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
nyet@1545 
     8
 
+ecjx.$(OBJEXT): $(ecjx_SOURCES)
nyet@1545 
     9
 
+	@rm -f ecjx.$(OBJEXT)
nyet@1545 
    10
 
+	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
nyet@1545 
    11
 
 gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES)
nyet@1545 
    12
 
 	@rm -f gappletviewer$(EXEEXT)
nyet@1545 
    13
 
 	$(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
crosstool-ng