Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.1/340-ecjx-host-cc.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 29 21:16:51 2009 +0100 (2009-12-29)
branch1.5
changeset 1707 b522b439a1e4
permissions -rw-r--r--
config: fix generated config files when GREP_OPTIONS set --color=always

grep is used when generating some .in files (in config.gen). If GREP_OPTIONS
contains --color=always, then the generated files will contains some escape
sequences setting the color, and mconf would choke on those escape sequences.

Always set and export an empty GREP_OPTIONS to avoid that.

Issue reported by Kevin Kirkup <kevin dot kirkup at gmail dot com> :
http://sourceware.org/ml/crossgcc/2009-12/msg00026.html
(transplanted from a5020a1facffc046d23d39a71a1b8089ca84beac)
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)
crosstool-ng