Changeset 28 for trunk

Timestamp:

Apr 21, 2003, 2:05:12 AM (22 years ago)

Author:

bird

Message:

Workaround for CP=\gcc.exe problem when entering intl.
Workaround for cp vs cp directory problem with ash.w

File:

• trunk/src/gcc/gcc/Makefile.in (modified) (13 diffs, 1 prop)

trunk/src/gcc/gcc/Makefile.in

@@ -113 +113 @@
 RANLIB = @RANLIB@
 SHELL = /bin/sh
+
+# "mkdir cp; cp something cp" doesn't work ash on OS/2.
+CP = cp@host_exeext@
+
 # on sysV, define this as cp.
 INSTALL = @INSTALL@
@@ -696 +700 @@
 FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) "CC=@cc_set_by_configure@" \
         "STAGE_PREFIX=@stage_prefix_set_by_configure@"
+        
+# OS/2 have some trouble here.  
+ifeq "$(BUILD_PLATFORM)" "OS2"
+PREPEND_DOTDOT_TO_RELATIVE_PATHS = sed -e 's|^ | |'
+SUBDIR_FLAGS_TO_PASS = $(FLAGS_TO_PASS)
+else
 PREPEND_DOTDOT_TO_RELATIVE_PATHS = sed \
         -e 's|^ *[^ /][^ /]*/|%&|' \
@@ -705 +715 @@
         "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" \
         "STAGE_PREFIX=`echo @quoted_stage_prefix_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`"
+endif   
+
 #
 
@@ -838 +850 @@
         $(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \
                 "$(xmake_file)" "$(tmake_file)"
-        cp config.status config.run
+        $(CP) config.status config.run
         LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.run
         rm -f config.run
@@ -974 +986 @@
 # Also create gcc-cross, so that install-common will install properly.
 gcc-cross: xgcc$(exeext)
-        cp xgcc$(exeext) gcc-cross$(exeext)
+        $(CP) xgcc$(exeext) gcc-cross$(exeext)
 
 cc1$(exeext): $(C_OBJS) $(BACKEND) $(LIBDEPS)
@@ -2092 +2104 @@
 test-protoize-simple: ./protoize ./unprotoize $(GCC_PASSES)
         -rm -f tmp-proto.[cso]
-        cp $(srcdir)/protoize.c tmp-proto.c
+        $(CP) $(srcdir)/protoize.c tmp-proto.c
         chmod u+w tmp-proto.c
         ./protoize -N -B ./ -x getopt.h -c "-B./ -Wall -Wwrite-strings \
@@ -2146 +2158 @@
             $(STAMP) include/$$realfile; \
             rm -f include/$$realfile; \
-            cp $$file include; \
+            $(CP) $$file include; \
             chmod a+r include/$$realfile; \
           fi; \
         done
         rm -f include/limits.h
-        cp xlimits.h include/limits.h
+        $(CP) xlimits.h include/limits.h
         chmod a+r include/limits.h
         rm -f include/float.h
         if [ x$(FLOAT_H) != xMakefile.in ]; then \
-          cp $(srcdir)/config/$(FLOAT_H) include/float.h && \
+          $(CP) $(srcdir)/config/$(FLOAT_H) include/float.h && \
           chmod a+r include/float.h; \
         else :; fi
 # Install the README
         rm -f include/README
-        cp $(srcdir)/README-fixinc include/README
+        $(CP) $(srcdir)/README-fixinc include/README
         chmod a+r include/README
         $(STAMP) $@
@@ -2197 +2209 @@
           mv include/limits.h include/syslimits.h; \
         else \
-          cp $(srcdir)/gsyslimits.h include/syslimits.h; \
+          $(CP) $(srcdir)/gsyslimits.h include/syslimits.h; \
         fi; \
         chmod a+r include/syslimits.h)
@@ -2834 +2846 @@
 # Install the include directory using cp.
 install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
-        cp -p -r include $(DESTDIR)$(libsubdir)
+        $(CP) -p -r include $(DESTDIR)$(libsubdir)
 
 # Use this target to install the program `collect2' under the name `collect2'.
@@ -3238 +3250 @@
         -if [ -f collect-ld$(exeext) ] ; then (cd stage1 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
         -rm -f stage1/libgcc.a stage1/libgcc_eh.a
-        -cp libgcc.a stage1
+        -$(CP) libgcc.a stage1
         -if $(RANLIB_TEST_FOR_TARGET) ; then \
           $(RANLIB_FOR_TARGET) stage1/libgcc.a; \
         else true; fi
-        -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage1; \
+        -if [ -f libgcc_eh.a ] ; then $(CP) libgcc_eh.a stage1; \
           if $(RANLIB_TEST_FOR_TARGET) ; then \
            $(RANLIB_FOR_TARGET) stage1/libgcc_eh.a; \
           else true; fi; fi
         -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
-          cp stage1/$${f} . ; \
+          $(CP) stage1/$${f} . ; \
         else true; \
         fi; done
@@ -3267 +3279 @@
         -if [ -f collect-ld$(exeext) ] ; then (cd stage2 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
         -rm -f stage2/libgcc.a stage2/libgcc_eh.a
-        -cp libgcc.a stage2
+        -$(CP) libgcc.a stage2
         -if $(RANLIB_TEST_FOR_TARGET) ; then \
           $(RANLIB_FOR_TARGET) stage2/libgcc.a; \
         else true; fi
-        -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage2; \
+        -if [ -f libgcc_eh.a ] ; then $(CP) libgcc_eh.a stage2; \
           if $(RANLIB_TEST_FOR_TARGET) ; then \
            $(RANLIB_FOR_TARGET) stage2/libgcc_eh.a; \
           else true; fi; fi
         -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
-          cp stage2/$${f} . ; \
+          $(CP) stage2/$${f} . ; \
         else true; \
         fi; done
@@ -3296 +3308 @@
         -if [ -f collect-ld$(exeext) ] ; then (cd stage3 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
         -rm -f stage3/libgcc.a stage3/libgcc_eh.a
-        -cp libgcc.a stage3
+        -$(CP) libgcc.a stage3
         -if $(RANLIB_TEST_FOR_TARGET) ; then \
           $(RANLIB_FOR_TARGET) stage3/libgcc.a; \
         else true; fi
-        -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage3; \
+        -if [ -f libgcc_eh.a ] ; then $(CP) libgcc_eh.a stage3; \
           if $(RANLIB_TEST_FOR_TARGET) ; then \
            $(RANLIB_FOR_TARGET) stage3/libgcc_eh.a; \
           else true; fi; fi
         -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
-          cp stage3/$${f} . ; \
+          $(CP) stage3/$${f} . ; \
         else true; \
         fi; done
@@ -3325 +3337 @@
         -if [ -f collect-ld$(exeext) ] ; then (cd stage4 && $(LN_S) ../collect-ld$(exeext) .) ; else true ; fi
         -rm -f stage4/libgcc.a stage4/libgcc_eh.a
-        -cp libgcc.a stage4
+        -$(CP) libgcc.a stage4
         -if $(RANLIB_TEST_FOR_TARGET) ; then \
           $(RANLIB_FOR_TARGET) stage4/libgcc.a; \
         else true; fi
-        -if [ -f libgcc_eh.a ] ; then cp libgcc_eh.a stage4; \
+        -if [ -f libgcc_eh.a ] ; then $(CP) libgcc_eh.a stage4; \
           if $(RANLIB_TEST_FOR_TARGET) ; then \
            $(RANLIB_FOR_TARGET) stage4/libgcc_eh.a; \
           else true; fi; fi
         -for f in .. $(EXTRA_MULTILIB_PARTS); do if [ x$${f} != x.. ]; then \
-          cp stage4/$${f} . ; \
+          $(CP) stage4/$${f} . ; \
         else true; \
         fi; done