Changeset 74 for trunk/src/gcc

Timestamp:

May 1, 2003, 3:45:01 AM (22 years ago)

Author:

bird

Message:

Corrected SHLIB_INSTALL t-emx

File:

• trunk/src/gcc/gcc/config/i386/t-emx (modified) (3 diffs, 1 prop)

trunk/src/gcc/gcc/config/i386/t-emx

@@ -1 +1 @@
 # EMX target have share libgcc, but the names are release specific and constrained by 8.3 limits.
 # The link command depends heavily on the directory structure.
-SHLIB_EXT      = 
+SHLIB_EXT      =
 SHLIB_BASENAME = gcc$(gccdll_version)
 SHLIB_MULTINAME= $(SHLIB_BASENAME)`echo @shlib_so_name@ | cut -b10`
@@ -14 +14 @@
         && ar rs $$(@D)/$(SHLIB_BASENAME).a libgcc/$$(@D)/__main.o libgcc/$$(@D)/emx-ctordtor.o libgcc/$$(@D)/emx-eh.o libgcc/$$(@D)/emx-dllinit.o \
     && touch $$@
-
-SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_DLLNAME) $$(DESTDIR)$$(slibdir)/
+SHLIB_SUBDIR  = `echo @shlib_base_name@ | sed -e "s/^libgcc_s_//" -e "s,_,/,g"`
+SHLIB_INSTALL = $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_DLLNAME) $$(DESTDIR)$$(slibdir)/ \
+    && $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_BASENAME).a $$(DESTDIR)$$(libsubdir)/
 
 # EMX Multi-threaded/Single-threaded libraries.
@@ -90 +91 @@
 # Some final polishing of libgcc ...
 # r=bird: Moved parts of this up to the SHLIB_LINK command.
+#   Use cp as mv causes recreation of libversions during make install.
+#   Is there ANY chance we could juse leave them as libgcc*.a? That would've
+#   been much more convenient... 8.3 isn't an argument.
 $(ALL): s-libgcc
 s-libgcc: $(LIBGCC)
         echo "t-emx hacks: $@ starting"
-        mv -f st/libgcc.a st/gcc.a
-        mv -f st/libgcc_eh.a st/gcc_eh.a
-        mv -f mt/libgcc.a mt/gcc.a
-        mv -f mt/libgcc_eh.a mt/gcc_eh.a
+        cp -f st/libgcc.a st/gcc.a
+        cp -f st/libgcc_eh.a st/gcc_eh.a
+        cp -f mt/libgcc.a mt/gcc.a
+        cp -f mt/libgcc_eh.a mt/gcc_eh.a
         $(STAMP) s-libgcc
         echo "t-emx hacks: $@ done"