diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-10 16:59:12 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-10 16:59:12 +0000 |
| commit | a4b758082a75a5d9023f5058185a7a1c863377cf (patch) | |
| tree | 8835066c732af3f44022e088899665d58540bdc2 | |
| parent | 74fdf1efbd5d1ab3f8cbf6beb3db395b1df9c64e (diff) | |
| download | gcc-5-a4b758082a75a5d9023f5058185a7a1c863377cf.tar.gz | |
* Enable libmpx builds on amd64, i386 and x32.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7882 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/rules.defs | 8 | ||||
| -rw-r--r-- | debian/rules2 | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index eb8ca6d..6a90bb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ gcc-5 (5-20150309-1) UNRELEASED; urgency=medium * Update to SVN 20150309. - libgo: Add arm64 to the pointer size map (Michael Hudson). - libgo: Add ppc to the pointer size map. + * Enable libmpx builds on amd64, i386 and x32. -- Matthias Klose <doko@debian.org> Tue, 10 Mar 2015 02:47:37 +0100 diff --git a/debian/rules.defs b/debian/rules.defs index aa6bbc7..8762a69 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -1092,6 +1092,14 @@ ifneq (,$(filter $(DEB_TARGET_ARCH),$(cilkrts_archs))) with_cilkrts := yes endif +# libmpx -------------------- +with_mpx := +with_mpx := $(call envfilt, mpx, , , $(with_mpx)) +mpx_archs = amd64 i386 x32 +ifneq (,$(filter $(DEB_TARGET_ARCH),$(mpx_archs))) + with_mpx := yes +endif + # gold -------------------- # armel with binutils 2.20.51 only gold_archs = amd64 armel armhf i386 powerpc powerpcspe ppc64 ppc64el sparc sparc64 x32 hurd-i386 diff --git a/debian/rules2 b/debian/rules2 index b093b21..59081a2 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -273,6 +273,10 @@ ifneq ($(with_qmath),yes) CONFARGS += --disable-libquadmath endif +ifneq ($(with_mpx),yes) + CONFARGS += --enable-libmpx +endif + ifeq ($(with_plugins),yes) CONFARGS += --enable-plugin endif |