2004/01/19 04:21:05

darcs-hash:20040130080411-2ba56-02cd4b40d47218150340e5179b6d2a0cecaed0b1.gz

diff --git a/Makefile b/Makefile
index dc019ac..cb9db8d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,15 +43,12 @@ gcc_optimizations  := -O2
 #gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
 #gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
 
-gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)
-gcc_flags          += -Iupstream/install/$(target)/include -Iupstream/install/lib/gcc-lib/$(target)/3.3/include
-gcc_flags          += -Iupstream/install/include -Ibuild/class
-gcj_flags          := -fCLASSPATH=build/java
-g++_flags          := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar
-gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target)
+gcc_flags          += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include
+gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java
 gcjh               := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
-g++                := upstream/install/bin/$(target)-gcj $(gcc_flags)
-gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags)
+g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
+gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
 gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform)

diff --git a/Makefile.upstream b/Makefile.upstream
index e170b21..f4aad8f 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -110,8 +110,8 @@ endif
        curl $(url_gcc-3.3) | tar xzf - -C upstream/gcc-3.3
        mv upstream/gcc-3.3/gcc-3.3 upstream/gcc-3.3/src-darwin; true
        mv upstream/gcc-3.3/libmspack upstream/gcc-3.3/src-darwin; true
-       (test -e upstream/gcc-3.3/patches && cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
-       (test -e upstream/gcc-3.3/patches-darwin && cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true
+       (cd upstream/gcc-3.3/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
+       (cd upstream/gcc-3.3/src-darwin && for A in ../patches-darwin/*.patch; do patch -p0 -l < $$A; done); true
        touch $@
 
 .download_%: