Source: cross-gcc
Version: 163
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

cilkrts got removed from gcc-8, so cross-ma-install-location.diff needs
to stop patching it.

Helmut
--- 0004-added-multi-arch-specific-install-location-patch.patch
+++ 0004-added-multi-arch-specific-install-location-patch.patch
@@ -16,7 +16,7 @@
 index 0000000..97117d6
 --- /dev/null
 +++ b/debian/patches/cross-ma-install-location.diff
-@@ -0,0 +1,379 @@
+@@ -0,0 +1,357 @@
 +Index: b/src/libada/configure.ac
 +===================================================================
 +--- a/src/libada/configure.ac
@@ -340,28 +340,6 @@
 +     toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
 +     ;;
 +   no)
-+-    if test -n "$with_cross_host" &&
-+-       test x"$with_cross_host" != x"no"; then
-+-      # Install a library built with a cross compiler in tooldir, not libdir.
-+-      toolexecdir='$(exec_prefix)/$(target_alias)'
-+-      toolexeclibdir='$(toolexecdir)/lib'
-+-    else
-+-      toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-+-      toolexeclibdir='$(libdir)'
-+-    fi
-++    toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-++    toolexeclibdir='$(libdir)'
-+     multi_os_directory=`$CC -print-multi-os-directory`
-+     case $multi_os_directory in
-+       .) ;; # Avoid trailing /.
-+Index: b/src/libcilkrts/configure.ac
-+===================================================================
-+--- a/src/libcilkrts/configure.ac
-++++ b/src/libcilkrts/configure.ac
-+@@ -103,15 +103,8 @@
-+     toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
-+     ;;
-+   no)
 +-    if test -n "$with_cross_host" &&
 +-       test x"$with_cross_host" != x"no"; then
 +-      # Install a library built with a cross compiler in tooldir, not libdir.

Reply via email to