make jdk 1.1 compliant part 1

[nestedvm.git] / upstream / Makefile

diff --git a/upstream/Makefile b/upstream/Makefile
index 63fde09..0e2b020 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -1,6 +1,6 @@
 # Inspired by XWT's Makefile.upstream
 
-version_gcc = 3.3
+version_gcc = 3.3.3
 
 url_gcc-core = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz
 url_gcc-c++ = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz
@@ -87,7 +87,7 @@ tasks/download_%:
        cd download && wget --passive-ftp -N $(url_$*)
        touch $@
 
-tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++
+tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77
        touch $@
 
 tasks/extract_%: tasks/download_%
@@ -124,7 +124,7 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
        mkdir -p $(usr)
        mkdir -p build/gcc-obj && cd build/gcc-obj && \
                echo | ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
-               $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/install/bin/mips-unknown-elf-gcc && \
+               $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
                $(MAKE) install
        touch $@
 
@@ -311,5 +311,5 @@ tasks/build_tex: tasks/build_tex_tangle tasks/build_gpc tasks/download_texinputs
                        --gpc-rts=-nwebfile:tex.web     \
                        --gpc-rts=-nchangefile:tex.ch   \
                        && \
-               mips-unknown-elf-gpc $(filter-out -Werror,$(MIPS_PCFLAGS)) tex.p $(MIPS_LDFLAGS) -o tex.mips
+               mips-unknown-elf-gpc $(MIPS_PCFLAGS) tex.p $(MIPS_LDFLAGS) -o tex.mips
        touch $@