From: Ben Collins <bcollins@debian.org>
Date: Mon, 9 Jun 2003 21:38:34 +0000 (+0000)
Subject: Handle multilib subdirs.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f03be4707b56e63827e8836ab64a3e291fc3585a;p=dpkg

Handle multilib subdirs.
---

diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index ecf559af..4f48e7a8 100755
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -134,7 +134,7 @@ if ($?>>8) {
     &warn("Couldn't determine gcc system type, falling back to default (native compilation)");
     $gcc = '';
 } else {
-    $gcc =~ s!^.*gcc-lib/([^/]*)/(?:egcs-)?\d+(?:[.\da-z]*)/libgcc.*$!$1!s;
+    $gcc =~ s!^.*gcc-lib/([^/]*)/(?:egcs-)?\d+(?:[.\da-z]*)/(|.*/)libgcc.*$!$1!s;
     if (defined $1 and $1 ne '') {
 	$gcc = $1;
     } else {