From 43c09fa8b9e044451abcb3cd6f09c870f7664d49 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 31 Aug 2017 18:56:17 +0000 Subject: [PATCH] defs.mk: Swap CFLAGS order (PROJECT <-> LOCAL) LOCAL_XXXFLAGS should override PROJECT_XXXFLAGS, so it's now fed later to compiler and linker. Signed-off-by: Jan Lindemann --- make/defs.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 741b4585..640d4405 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -1051,9 +1051,9 @@ COMPILER_CPPFLAGS += $(GCC_CPPFLAGS) COMPILER_LDFLAGS += $(GCC_LDFLAGS) endif -BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE) -BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(INCLUDE) -BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) +BUILD_CFLAGS += $(PROJECT_CFLAGS) $(LOCAL_CFLAGS) $(COMPLILER_CFLAGS) $(INCLUDE) +BUILD_CPPFLAGS += $(PROJECT_CPPFLAGS) $(LOCAL_CPPFLAGS) $(COMPILER_CPPFLAGS) $(INCLUDE) +BUILD_LDFLAGS += $(PROJECTLIB_LDFLAGS) $(LOCAL_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) #RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix)) RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)