From 607827292053aa25d0f0300add0798dd085a9131 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sun, 15 Mar 2015 20:46:36 -0400
Subject: compiler building blocks: add support for custom build variables.

feature detection: set a fallback value of 'yes' to modern assembler
presence, PE dward support, libc-provided stack protector, and
dynamic-loader header iteration.

signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information.
---
 Makefile.in | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 51edbdf02..6a3d4a728 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,6 +90,21 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 
+# ----------------------------------
+# Compiler Building Blocks variables
+# ----------------------------------
+cbb_xgcc_for_specs     = @cbb_xgcc_for_specs@
+cbb_ldflags_for_target = @cbb_ldflags_for_target@
+cbb_sysroot_for_libgcc = @cbb_sysroot_for_libgcc@
+
+cbb_cflags_for_stage1  = @cbb_cflags_for_stage1@
+cbb_cflags_for_stage2  = @cbb_cflags_for_stage2@
+cbb_cflags_for_stage3  = @cbb_cflags_for_stage3@
+cbb_cflags_for_stage4  = @cbb_cflags_for_stage4@
+
+cbb_cflags_for_stageprofile  = @cbb_cflags_for_stageprofile@
+cbb_cflags_for_stagefeedback = @cbb_cflags_for_stagefeedback@
+
 # -------------------------------------------------
 # Miscellaneous non-standard autoconf-set variables
 # -------------------------------------------------
@@ -142,7 +157,10 @@ BASE_EXPORTS = \
 	M4="$(M4)"; export M4; \
 	SED="$(SED)"; export SED; \
 	AWK="$(AWK)"; export AWK; \
-	MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
+	MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \
+	cbb_xgcc_for_specs="$(cbb_xgcc_for_specs)"; export cbb_xgcc_for_specs; \
+	cbb_ldflags_for_target="$(cbb_ldflags_for_target)" ; export cbb_ldflags_for_target; \
+	cbb_sysroot_for_libgcc="$(cbb_sysroot_for_libgcc)" ; export cbb_sysroot_for_libgcc;
 
 # This is the list of variables to export in the environment when
 # configuring subdirectories for the build system.
@@ -418,7 +436,7 @@ STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
 
 
 # Defaults for stage 1; some are overridden below.
-STAGE1_CFLAGS = $(STAGE_CFLAGS)
+STAGE1_CFLAGS = $(STAGE_CFLAGS) $(cbb_cflags_for_stage1)
 STAGE1_CXXFLAGS = $(CXXFLAGS)
 @if target-libstdc++-v3-bootstrap
 # Override the above if we're bootstrapping C++.
@@ -428,7 +446,7 @@ STAGE1_TFLAGS = $(STAGE_TFLAGS)
 STAGE1_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage 2; some are overridden below.
-STAGE2_CFLAGS = $(STAGE_CFLAGS)
+STAGE2_CFLAGS = $(STAGE_CFLAGS) $(cbb_cflags_for_stage2)
 STAGE2_CXXFLAGS = $(CXXFLAGS)
 @if target-libstdc++-v3-bootstrap
 # Override the above if we're bootstrapping C++.
@@ -438,7 +456,7 @@ STAGE2_TFLAGS = $(STAGE_TFLAGS)
 STAGE2_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage 3; some are overridden below.
-STAGE3_CFLAGS = $(STAGE_CFLAGS)
+STAGE3_CFLAGS = $(STAGE_CFLAGS) $(cbb_cflags_for_stage3)
 STAGE3_CXXFLAGS = $(CXXFLAGS)
 @if target-libstdc++-v3-bootstrap
 # Override the above if we're bootstrapping C++.
@@ -448,7 +466,7 @@ STAGE3_TFLAGS = $(STAGE_TFLAGS)
 STAGE3_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage 4; some are overridden below.
-STAGE4_CFLAGS = $(STAGE_CFLAGS)
+STAGE4_CFLAGS = $(STAGE_CFLAGS) $(cbb_cflags_for_stage4)
 STAGE4_CXXFLAGS = $(CXXFLAGS)
 @if target-libstdc++-v3-bootstrap
 # Override the above if we're bootstrapping C++.
@@ -458,7 +476,7 @@ STAGE4_TFLAGS = $(STAGE_TFLAGS)
 STAGE4_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage profile; some are overridden below.
-STAGEprofile_CFLAGS = $(STAGE_CFLAGS)
+STAGEprofile_CFLAGS = $(STAGE_CFLAGS) $(cbb_cflags_for_stageprofile)
 STAGEprofile_CXXFLAGS = $(CXXFLAGS)
 @if target-libstdc++-v3-bootstrap
 # Override the above if we're bootstrapping C++.
@@ -468,7 +486,7 @@ STAGEprofile_TFLAGS = $(STAGE_TFLAGS)
 STAGEprofile_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 # Defaults for stage feedback; some are overridden below.
-STAGEfeedback_CFLAGS = $(STAGE_CFLAGS)
+STAGEfeedback_CFLAGS = $(STAGE_CFLAGS) $(cbb_cflags_for_stagefeedback)
 STAGEfeedback_CXXFLAGS = $(CXXFLAGS)
 @if target-libstdc++-v3-bootstrap
 # Override the above if we're bootstrapping C++.
@@ -484,7 +502,7 @@ STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
 # overrideable (for a bootstrap build stage1 also builds gcc.info).
 
-STAGE1_CFLAGS = @stage1_cflags@
+STAGE1_CFLAGS = @stage1_cflags@ $(cbb_cflags_for_stage1)
 STAGE1_CHECKING = @stage1_checking@
 STAGE1_LANGUAGES = @stage1_languages@
 # * We force-disable intermodule optimizations, even if
-- 
cgit v1.2.3