patches/gcc/4.4.1/340-ecjx-host-cc.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
nyet@1545
     1
diff -ur gcc-4.4.1-orig/libjava/Makefile.in gcc-4.4.1/libjava/Makefile.in
nyet@1545
     2
--- gcc-4.4.1-orig/libjava/Makefile.in	2009-08-04 04:12:27.000000000 -0700
nyet@1545
     3
+++ gcc-4.4.1/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)