Package: src:glibc
Version: 2.24-0experimental0
Tags: patch

build stage1 glibc without a C++ compiler.  As long as this is not required, we
shouldn't be forced to a C++ compiler for stage1.
--- glibc-2.24/debian/rules.d/build.mk~	2016-08-12 10:49:51.119631719 +0200
+++ glibc-2.24/debian/rules.d/build.mk	2016-08-12 12:54:25.763270288 +0200
@@ -31,10 +31,12 @@
 	@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
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+	echo "CXX = $(call xx,CXX)"               >> $(DEB_BUILDDIR)/configparms
 	echo "BUILD_CXX = $(BUILD_CXX)"           >> $(DEB_BUILDDIR)/configparms
+endif
 	echo "CFLAGS = $(HOST_CFLAGS)"            >> $(DEB_BUILDDIR)/configparms
 	echo "ASFLAGS = $(HOST_CFLAGS)"           >> $(DEB_BUILDDIR)/configparms
 	echo "BUILD_CFLAGS = $(BUILD_CFLAGS)"     >> $(DEB_BUILDDIR)/configparms
@@ -83,7 +85,7 @@
 	$(call logme, -a $(log_build), \
 		cd $(DEB_BUILDDIR) && \
 		CC="$(call xx,CC)" \
-		CXX="$(call xx,CXX)" \
+		$(if $(filter stage1,$(DEB_BUILD_PROFILES)),,CXX="$(call xx,CXX)") \
 		MIG="$(call xx,MIG)" \
 		AUTOCONF=false \
 		MAKEINFO=: \

Reply via email to