Changeset 265

Timestamp:

May 28, 2003, 10:55:59 PM (22 years ago)

Author:

bird

Message:

New spec hack.

File:

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

trunk/Makefile

@@ -471 +471 @@
                 
 ifeq "$(BUILD_PLATFORM)" "OS2"
-TOOL_SYMLINK_FILE   = cp
-TOOL_SYMLINK_DIR    = cp -Rf
+TOOL_SYMLINK_FILE   = cp -p
+TOOL_SYMLINK_DIR    = cp -pRf
 TOOL_SYMLINK_MKDIR  = mkdir
 TOOL_UNSYMLINK_DIR  = rm -Rf
@@ -651 +651 @@
                 $(PATH_OBJ)/gcc/.ts.configured
 ifeq "$(BUILD_PLATFORM)" "OS2"          
+ifeq "" "1"
         unset GCCLOAD ; $(MAKE) -C $(PATH_OBJ)/gcc \
                 LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO)" \
@@ -658 +659 @@
                 $(if $(wildcard $(PATH_OBJ)/.all-stage1),       CFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -O2") \
                 $(if $(wildcard $(PATH_OBJ)/.all-stage1),     CXXFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -O2") \
-                $(if $(wildcard $(PATH_OBJ)/.all-stage1),  BOOT_CFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -O2") \
+                $(if $(wildcard $(PATH_OBJ)/.all-stage1),  BOOT_CFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2") \
                 $(if $(wildcard $(PATH_OBJ)/.all-stage1),      LDFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -Zexe -Zcrtdll") \
                 $(if $(wildcard $(PATH_OBJ)/.all-stage1), BOOT_LDFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -Zexe -Zcrtdll") \
                 bootstrap
+else
+        unset GCCLOAD ; $(MAKE) -C $(PATH_OBJ)/gcc \
+                LIBGCC2_DEBUG_CFLAG="$(BUILD_DEBUGINFO)" \
+                      CFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -O2" \
+                    CXXFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -O2" \
+                 BOOT_CFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -O2" \
+                     LDFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -Zexe -Zcrtdll" \
+                BOOT_LDFLAGS="$(BUILD_DEBUGINFO) -specs $(PATH_TOP)/src/emx/src/lib/libc.specs -Zexe -Zcrtdll" \
+                bootstrap
+endif           
 else
         $(MAKE) -C $(PATH_OBJ)/gcc bootstrap
@@ -703 +714 @@
 #       Repeating the prefix doesn't hurt anybody.
 gcc-install-it:
-        $(MAKE) prefix=$(PATH_BIND)/usr install
+        $(MAKE) prefix=$(ALL_PREFIX) install
 
 
@@ -889 +900 @@
 EMX_MODE = opt
 endif
-EMX_OUT  = out/
+EMX_OUT  = out/
 EMX_INS  = out/install/
+EMX_RULES= $(PATH_TOP)/src/emx/$(EMX_OUT)$(EMX_MODE)/genrules.smak
+#EMX_OUT  = $(PATH_OBJ)/emx/
+#EMX_INS  = $(ALL_PREFIX)/
+#EMX_RULES= $(EMX_OUT)$(EMX_MODE)/genrules.smak
 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"
@@ -901 +916 @@
 
 # This is the configure equivalent.     
-emx-configure-it: $(PATH_TOP)/src/emx/out/$(EMX_MODE)/genrules.smak
-$(PATH_TOP)/src/emx/$(EMX_OUT)$(EMX_MODE)/genrules.smak:
-        rm -f $(PATH_TOP)/src/emx/out/$(EMX_MODE)/genrules.smak
-        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) $(EMX_OUT)$(EMX_MODE)/genrules.smak
-        
-# tricky thing here, need to make sure emxomf is made first.
-emx-build-it: \
-                $(PATH_TOP)/src/emx/$(EMX_OUT)$(EMX_MODE)/genrules.smak
-        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) emxomf all
-
-emx-install-it: \
-                $(PATH_TOP)/src/emx/$(EMX_OUT)$(EMX_MODE)/genrules.smak
-        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) install
+emx-configure-it: $(EMX_RULES)
+$(EMX_RULES):
+        rm -f $(EMX_RULES)
+        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) $(EMX_RULES)
+        
+# make handle issue here. Make portions at the time.
+emx-build-it: $(EMX_RULES)
+        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) tools
+        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) os2 libsocket libdl
+        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) libs
+        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) all
+
+emx-install-it: $(EMX_RULES)
+        $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(ALL_PREFIX)/ install