[glibc] 01/01: debian/rules.d/build.mk: disable the C++ compiler for stage 1 builds, based on a patch from Matthias Klose. Closes: #834138.
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 3b40ff5e9ff6431ddf87fafa692d39b1f1e01ef4
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Aug 13 17:24:51 2016 +0200
debian/rules.d/build.mk: disable the C++ compiler for stage 1 builds, based on a patch from Matthias Klose. Closes: #834138.
---
debian/changelog | 2 ++
debian/rules.d/build.mk | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c79285e..1a4a98b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ 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,
+ 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 abc1225..231d387 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -30,8 +30,6 @@ $(patsubst %,configure_%,$(GLIBC_PASSES)) :: configure_% : $(stamp)configure_%
$(stamp)configure_%: $(stamp)mkbuilddir_%
@echo Configuring $(curpass)
rm -f $(DEB_BUILDDIR)/configparms
- echo "CC = $(call xx,CC)" >> $(DEB_BUILDDIR)/configparms
- echo "CXX = $(call xx,CXX)" >> $(DEB_BUILDDIR)/configparms
echo "MIG = $(call xx,MIG)" >> $(DEB_BUILDDIR)/configparms
echo "BUILD_CC = $(BUILD_CC)" >> $(DEB_BUILDDIR)/configparms
echo "BUILD_CXX = $(BUILD_CXX)" >> $(DEB_BUILDDIR)/configparms
@@ -81,7 +79,7 @@ $(stamp)configure_%: $(stamp)mkbuilddir_%
$(call logme, -a $(log_build), \
cd $(DEB_BUILDDIR) && \
CC="$(call xx,CC)" \
- CXX="$(call xx,CXX)" \
+ CXX=$(if $(filter stage1,$(DEB_BUILD_PROFILES)),:,"$(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: