diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-04-30 21:46:27 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-04-30 21:46:27 +0000 |
| commit | 7d4d61f8ddd4faff021e67fe932f541c03c99142 (patch) | |
| tree | 748703ff8ee72789ebf85478a926f51cd635746d /debian/rules.patch | |
| parent | 97dbf394c77aa07929d20a8ac4c0b9c24662f3b7 (diff) | |
| download | gcc-5-7d4d61f8ddd4faff021e67fe932f541c03c99142.tar.gz | |
* Apply the cross-biarch patch for every cross build.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8004 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.patch')
| -rw-r--r-- | debian/rules.patch | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/debian/rules.patch b/debian/rules.patch index 4c03ce0..138c72e 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -272,13 +272,9 @@ ifneq ($(single_package),yes) debian_patches += canonical-cpppath endif endif -ifeq ($(DEB_CROSS),yes) +ifneq (,$(filter $(build_type), build-cross cross-build-cross)) debian_patches += cross-no-locale-include -endif -ifeq ($(biarch64),yes) - ifeq ($(DEB_CROSS),yes) - debian_patches += cross-biarch - endif + debian_patches += cross-biarch endif debian_patches += gcc-multilib-multiarch |