summaryrefslogtreecommitdiff
path: root/debian/rules.patch
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2012-11-21 14:38:56 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2012-11-21 14:38:56 +0000
commit1b2e0c81e42137f103ae7f77837e599791a9a1a9 (patch)
treec2b1854183af49cb66c2d62ada68eff0fb89b22f /debian/rules.patch
parent5e468694b043a6044f34dabd61427b1a3e0aa2f1 (diff)
downloadgcc-47-1b2e0c81e42137f103ae7f77837e599791a9a1a9.tar.gz
* Split multiarch patches into local and upstreamed parts.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6284 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.patch')
-rw-r--r--debian/rules.patch1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/rules.patch b/debian/rules.patch
index 802cae0..81dc132 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -259,6 +259,7 @@ debian_patches += libffi-ro-eh_frame_sect
ifeq ($(trunk_build),yes)
debian_patches += gcc-multiarch-trunk
else
+ debian_patches += $(if $(with_linaro_branch),,gcc-multiarch-upstream)
debian_patches += gcc-multiarch$(if $(with_linaro_branch),-linaro)
debian_patches += gcc-powerpc-nof
endif