summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makeconfig2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8af30250f6..45520095d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-16 Florian Weimer <fweimer@redhat.com>
+
+ * Makeconfig (ASFLAGS): Always append required assembler flags.
+
2018-08-16 Moritz Eckert <m.eckert@cs.ucsb.edu>
* malloc/malloc.c (_int_free): Check for corrupt prev_size vs size.
diff --git a/Makeconfig b/Makeconfig
index 608ffe648c..099f184088 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1047,7 +1047,7 @@ endif
ifndef ASFLAGS
ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
endif
-ASFLAGS += -Werror=undef $(ASFLAGS-config) $(asflags-cpu)
+override ASFLAGS += -Werror=undef $(ASFLAGS-config) $(asflags-cpu)
ifndef BUILD_CC
BUILD_CC = $(CC)