Changeset 255 for trunk/Makefile

Timestamp:

May 27, 2003, 10:09:23 PM (22 years ago)

Author:

bird

Message:

libc specs hack.

File:

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

trunk/Makefile

@@ -647 +647 @@
 #   Because strip is broken on OS/2 we pass -s for release build and -g for
 #   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...
 gcc-build-it: \
                 $(PATH_OBJ)/gcc/.ts.configured
@@ -655 +656 @@
                 BOOT_LDFLAGS="$(BUILD_DEBUGINFO) -Zexe -Zcrtdll" \
                 LIBGCC2_DEBUG_CFLAG="$(BUILD_DEBUGINFO)" \
+                $(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
@@ -921 +924 @@
                                                                         
 # Install the compiled emx stuff to builttools.
-emx-builttools-stage2:  
+emx-builttools-stage2: emx-builttools-stage2-specs
         $(MAKE) -C $(PATH_TOP)/src/emx $(EMX_DEFINES) INS=$(PATH_BUILTTOOLS)/  install
+
+# bird: for now we will just replace the specs with the constantly updated libc specs.  
+emx-builttools-stage2-specs:
+        -mv -f $(PATH_BUILTTOOLS)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs \
+                   $(PATH_BUILTTOOLS)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/emxspecs
+        cp $(PATH_TOP)/src/emx/src/lib/libc.specs \
+                   $(PATH_BUILTTOOLS)/lib/gcc-lib/i386-pc-os2-emx/$(GCC_VERSION)/specs