This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 06/17] Allow overriding of CFLAGS as well as CPPFLAGS for rtld.
- From: Nix <nix at esperi dot org dot uk>
- To: libc-alpha at sourceware dot org
- Date: Sun, 13 Mar 2016 15:16:51 +0000
- Subject: [PATCH 06/17] Allow overriding of CFLAGS as well as CPPFLAGS for rtld.
- Authentication-results: sourceware.org; auth=none
- References: <1457882222-22599-1-git-send-email-nix at esperi dot org dot uk>
From: Nick Alcock <nick.alcock@oracle.com>
We need this to pass -fno-stack-protector to all the pieces of rtld in
non-elf/ directories.
* elf/rtld-Rules (rtld-compile-command.c): Add $(rtld-CFLAGS).
* scripts/sysd-rules.awk: Substitute in $(CFLAGS) as well as
$(CPPFLAGS).
---
elf/rtld-Rules | 2 +-
scripts/sysd-rules.awk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index 94ca39b..c1bb506 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -90,7 +90,7 @@ else
rtld-compile-command.S = $(compile-command.S) $(rtld-CPPFLAGS)
rtld-compile-command.s = $(compile-command.s) $(rtld-CPPFLAGS)
-rtld-compile-command.c = $(compile-command.c) $(rtld-CPPFLAGS)
+rtld-compile-command.c = $(compile-command.c) $(rtld-CPPFLAGS) $(rtld-CFLAGS)
# These are the basic compilation rules corresponding to the Makerules ones.
# The sysd-rules generated makefile already defines pattern rules for rtld-%
diff --git a/scripts/sysd-rules.awk b/scripts/sysd-rules.awk
index cebc9d3..69af400 100644
--- a/scripts/sysd-rules.awk
+++ b/scripts/sysd-rules.awk
@@ -54,7 +54,7 @@ BEGIN {
command_suffix = "";
} else {
prefix = gensub(/%/, "", 1, target_pattern);
- command_suffix = " $(" prefix "CPPFLAGS)";
+ command_suffix = " $(" prefix "CPPFLAGS)" " $(" prefix "CFLAGS)";
}
target = "$(objpfx)" target_pattern o ":";
if (asm_rules) {
--
2.7.0.198.g6dd47b6