Changeset 266

Timestamp:

May 28, 2003, 11:12:10 PM (22 years ago)

Author:

bird

Message:

safer hack.

File:

• trunk/Makefile (modified) (1 diff, 1 prop)

trunk/Makefile ¶

@@ -648 +648 @@
 #   non release builds - This overrides some stuff in src/gcc/gcc/config/i386/t-emx!
 # For the 2nd stage we need a hack for using the right specs when linking...
+SPEC_HACK = $(if $(wildchar $(PATH_OBJ)/.all-stage1),\
+              -specs $(PATH_TOP)/src/emx/src/lib/libc.specs, \
+              -specs $(PATH_TOP)/tools/x86.os2/gcc/staged/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs)
 gcc-build-it: \
                 $(PATH_OBJ)/gcc/.ts.configured
 ifeq "$(BUILD_PLATFORM)" "OS2"          
-ifeq "" "1"
         unset GCCLOAD ; $(MAKE) -C $(PATH_OBJ)/gcc \
-                LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO)" \
-                BOOT_CFLAGS="$(BUILD_DEBUGINFO) -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2" \
-                BOOT_LDFLAGS="$(BUILD_DEBUGINFO) -Zexe -Zcrtdll" \
-                LIBGCC2_DEBUG_CFLAG="$(BUILD_DEBUGINFO)" \
-                $(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 -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") \
+            LIBGCC2_DEBUG_CFLAGS="$(BUILD_DEBUGINFO)" \
+                      CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2" \
+                    CXXFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2" \
+                 BOOT_CFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2" \
+                     LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -Zexe -Zcrtdll" \
+                BOOT_LDFLAGS="$(SPEC_HACK) $(BUILD_DEBUGINFO) -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