From bcbc9f83bc4f294f526f1e69e072987f6ddcdd94 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 30 Jan 2019 16:23:36 +0000 Subject: [PATCH] defs.mk: Change build C|CPP|LDFLAGS order Order is now: $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) which resulted in header files specified in $(LOCAL_CFLAGS) found after those of $(PROJECT_CFLAGS). Still not optimal, as this way other general flags, e.g. optimization flags, override more specialized ones. Maybe use INCLUDES instead. 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 863fe95a..8bf9fa21 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -1093,9 +1093,9 @@ COMPILER_CPPFLAGS += $(GCC_CPPFLAGS) COMPILER_LDFLAGS += $(GCC_LDFLAGS) endif -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) +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) #RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix)) RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)