[glibc] 01/02: Disable the C++ compiler for nocheck instead of for stage1
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.24
in repository glibc.
commit c8d432d1f6dd0e7fd144e8246e827645ef6b3c7d
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Aug 14 17:54:59 2016 +0200
Disable the C++ compiler for nocheck instead of for stage1
---
debian/changelog | 2 +-
debian/rules.d/build.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1a4a98b..7842fe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ glibc (2.24-0experimental1) UNRELEASED; urgency=medium
merged upstream from the 2.23 version.
* patches/localedata/locale-C.diff: update to unicode 8.0.0, add missing
categories, use the copy directive when possible.
- * debian/rules.d/build.mk: disable the C++ compiler for stage 1 builds,
+ * debian/rules.d/build.mk: disable the C++ compiler when tests are disabled,
based on a patch from Matthias Klose. Closes: #834138.
-- Samuel Thibault <sthibault@debian.org> Thu, 04 Aug 2016 09:20:04 +0200
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index 231d387..e1ec58d 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -79,7 +79,7 @@ $(stamp)configure_%: $(stamp)mkbuilddir_%
$(call logme, -a $(log_build), \
cd $(DEB_BUILDDIR) && \
CC="$(call xx,CC)" \
- CXX=$(if $(filter stage1,$(DEB_BUILD_PROFILES)),:,"$(call xx,CXX)") \
+ CXX=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),:,"$(call xx,CXX)") \
MIG="$(call xx,MIG)" \
AUTOCONF=false \
MAKEINFO=: \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: