Changeset 282

Timestamp:

Jun 3, 2003, 2:12:51 AM (22 years ago)

Author:

bird

Message:

#383: dropp the spec hacks.

File:

• trunk/Makefile (modified) (3 diffs, 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)
+#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)
+SPECS_HACK =
 gcc-build-it: \
                 $(PATH_OBJ)/gcc/.ts.configured
@@ -717 +718 @@
 
 # Install to builttools directory.      
+##     WARNING! Another spec HACK!
 gcc-builttools-stage2:
         $(MAKE) -C $(PATH_OBJ)/gcc prefix=$(PATH_BUILTTOOLSD) install
+##      cp $(PATH_TOP)/src/emx/src/lib/libc.specs $(PATH_OBJ)/gcc/gcc/specs
 
                 
@@ -932 +935 @@
                                                                         
 # Install the compiled emx stuff to builttools.
-emx-builttools-stage2: emx-builttools-stage2-specs
+##emx-builttools-stage2: emx-builttools-stage2-specs
+emx-builttools-stage2:
         $(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.  
+## 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
+##      -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