Changeset 1137

Timestamp:

Feb 1, 2004, 8:18:55 AM (22 years ago)

Author:

bird

Message:

quick stuff.

File:

• trunk/Makefile (modified) (10 diffs, 1 prop)

trunk/Makefile

@@ -57 +57 @@
 export GCC_VERSION              ?= 3.2.2
 export GCC_VERSION_SHORT        ?= 3022
+export GCC_RELEASE_ID           ?= beta4
 export GCC_CVS_VENDOR                   ?= GNU
 export GCC_CVS_REL                              ?= GCC_3-2-2
@@ -97 +98 @@
 
 # Misc Helpers
-ALL_PREFIX                  = $(PATH_BIND)/$(GCC_VERSION)/usr
+ALL_PREFIX                  = $(PATH_BIND)/$(GCC_VERSION)-$(GCC_RELEASE_ID)/usr
 TOOL_CVS_DIFF_TREE          = -cvs diff -R -N -w -u -r
 ifeq "$(BUILD_PLATFORM)" "OS2"
@@ -384 +385 @@
         if [ -d $(PATH_OBJ)/gcc ] ; then mv $(PATH_OBJ)/gcc $(PATH_OBJ)/stage1/gcc; fi
         if [ -d $(PATH_OBJ)/emx ] ; then mv $(PATH_OBJ)/emx $(PATH_OBJ)/stage1/emx; fi
-        if [ -d $(PATH_TOP)/src/emx/out ] ; then mv $(PATH_TOP)/src/emx/out $(PATH_OBJ)/stage1/emx_out; fi
+#       if [ -d $(PATH_TOP)/src/emx/out ] ; then mv $(PATH_TOP)/src/emx/out $(PATH_OBJ)/stage1/emx_out; fi
         $(MAKE) $(MAKEOPT) -j 1 -f $(MAKEFILE) all-preload
         touch $@
@@ -535 +536 @@
 
 # Installs the stuff we've built.                       
-all-quick-install:
+all-quick-install: \
+                all-banner-install \
+                gcc-install     \
+                binutils-install \
+                emx-install \
+                misc-install \
+                all-banner-install-done \
         echo todo
         
@@ -904 +911 @@
 
 
-
 # easy, update src/gcc/gcc/version.c
 gcc-versionstamps:
@@ -930 +936 @@
         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLS_TMPD) install
         cp -Rf $(PATH_BUILTTOOLS_TMP)/* $(PATH_BUILTTOOLS)/
+        rm -Rf $(PATH_BUILTTOOLS_TMP)
 
                 
@@ -1098 +1105 @@
         rm -Rf $(PATH_BUILTTOOLS_TMP)
         $(MAKE) $(MAKEOPT) -C $(PATH_OBJ)/binutils prefix=$(PATH_BUILTTOOLS_TMPD) install
+        rm $(PATH_BUILTTOOLS_TMP)/bin/ld.exe
         cp -Rf $(PATH_BUILTTOOLS_TMP)/* $(PATH_BUILTTOOLS)/
+        rm -Rf $(PATH_BUILTTOOLS_TMP)
 
                                         
@@ -1135 +1144 @@
 EMX_MODE = opt
 endif
-EMX_OUT  = out/
-EMX_INS  = out/install/
-#EMX_OUT  = $(PATH_OBJ)/emx/
-#EMX_INS  = $(ALL_PREFIX)/
+#EMX_OUT  = out/
+#EMX_INS  = out/install/
+EMX_OUT  = $(PATH_OBJD)/emx/
+EMX_INS  = $(ALL_PREFIX)/
 EMX_MASM = $(PATH_TOP)/tools/x86.os2/masm/v6.0/binp/ml.exe
-EMX_DEFINES = OUT=$(EMX_OUT) INS=$(EMX_INS) MODE=$(EMX_MODE) "ASM=$(EMX_MASM) -c"
+EMX_DEFINES = "OUT=$(EMX_OUT)" "INS=$(EMX_INS)" "MODE=$(EMX_MODE)" "ASM=$(EMX_MASM) -c"
                                                                         
 # build the components. (directory changer rules)
 .PHONY: emx-build emx-install emx-configure
-emx-build emx-install emx-configure:
+emx-build emx-install:
         mkdir -p $(PATH_OBJ)/emx
         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx -f $(MAKEFILE) $@-it
 
-# This is the configure equivalent.     
-emx-configure-it:
-        @echo ...
-        
-# make handle issue here. Make portions at the time.
 emx-build-it:
         $(MAKE) $(MAKEOPT) -j 1 -C $(PATH_TOP)/src/emx $(EMX_DEFINES) tools
@@ -1166 +1170 @@
                                                                         
 # Install the compiled emx stuff to builttools.
-##emx-builttools-stage2: emx-builttools-stage2-specs
 emx-builttools-stage2:
         $(MAKE) $(MAKEOPT) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS_TMP)/  install
-
-## bird: for now we will just replace the specs with the constantly updated libc specs. 
-emx-builttools-stage2-specs:
-##      -mv -f $(PATH_BUILTTOOLS_TMP)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs \
-##                 $(PATH_BUILTTOOLS_TMP)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/emxspecs
-##      cp $(PATH_TOP)/src/emx/src/lib/libc.specs \
-##                 $(PATH_BUILTTOOLS_TMP)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs
-
 
 # Quick bootstrap workers.                      
@@ -1221 +1216 @@
 
 ZIPFLAGS=-rX9
-ZIPBASE=$(PATH_BIN)/GCC-$(GCC_VERSION)-beta3fix1
+ZIPBASE=$(PATH_BIN)/GCC-$(GCC_VERSION)-$(GCC_RELEASE_ID)
 
 packing-all: