[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#483906: Adding amd64 -> i486 cross compiler



Hello,

This patch also fixes amd64->i486, plus it includes the above patch for powerpc.

Cheers

-- 
 Héctor Orón
diff -urN gcc-4.2-4.2.4/debian/rules.d/binary-libstdcxx-cross.mk gcc-4.2-4.2.4.cross/debian/rules.d/binary-libstdcxx-cross.mk
--- gcc-4.2-4.2.4/debian/rules.d/binary-libstdcxx-cross.mk	2008-06-02 10:51:20.000000000 +0000
+++ gcc-4.2-4.2.4.cross/debian/rules.d/binary-libstdcxx-cross.mk	2008-06-02 13:43:04.000000000 +0000
@@ -8,6 +8,16 @@
   arch_binaries	:= $(arch_binaries) lib32stdcxx
 endif
 
+ifeq ($(biarch),yes)
+AUXDEB := $(DEB_TARGET_GNU_TYPE)
+ifeq ($(DEB_TARGET_GNU_TYPE),powerpc-linux-gnu)
+AUXDEB := powerpc64-linux-gnu
+endif
+ifeq ($(DEB_TARGET_GNU_TYPE),i486-linux-gnu)
+AUXDEB := x86_64-linux-gnu
+endif
+endif
+
 ifeq ($(with_cxxdev),yes)
   arch_binaries  := $(arch_binaries) libstdcxx-dev
 endif
@@ -280,7 +290,7 @@
 	-find $(d) -type d -name '*.gch' | xargs rm -rf
 
 ifeq ($(biarch),yes)
-	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/lib*c++*.a $(d)/$(gcc_lib_dir)/$(biarchsubdir)/.
+	mv $(d)/$(PF)/$(AUXDEB)/lib64/lib*c++*.a $(d)/$(gcc_lib_dir)/$(biarchsubdir)/.
 	ln -sf ../../../../../lib64/libstdc++.so.$(CXX_SONAME) \
 		$(d)/$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.so
 endif

Reply to: