From 4fdb180a9eaeda2d0d5df7049450c126b44a08ba Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 3 Mar 2016 17:38:38 +0000 Subject: [PATCH] defs.mk: Add support for GCC_XXXFLAGS and CLANG_XXXFLAGS Signed-off-by: Jan Lindemann --- make/defs.mk | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 347f8911..8a760a02 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -1012,9 +1012,21 @@ ifeq ($(USE_GLIB),true) endif endif -BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) -BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) -BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) +ifeq ($(CC),$(CLANG)) +COMPILER_CFLAGS += $(CLANG_CFLAGS) +COMPILER_CPPFLAGS += $(CLANG_CPPFLAGS) +COMPILER_LDFLAGS += $(CLANG_LDFLAGS) +endif + +ifeq ($(CC),$(GCC)) +COMPILER_CFLAGS += $(GCC_CFLAGS) +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) #RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix)) RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)