build: compiler options

Leandro Dorileo · Leandro Dorileo · commit 1069974351b7 · 2015-08-26T16:01:27.000-03:00
This patch re-organizes the compiler option into their own menu entry,
adds a release/debug build type and also includes the CONFIG_CFLAGS and
CONFIG_LDFLAGS configuration alternatives.

Signed-off-by: Leandro Dorileo &lt;leandro.maciel.dorileo@intel.com&gt;
diff --git a/Kconfig b/Kconfig
@@ -30,26 +30,6 @@ config ENABLE_DYNAMIC_MODULES
 	depends on SHARED_LIBRARY
 	default n
 
-config CC_SANITIZE
-	bool "Compiler sanitize"
-	depends on FEATURE_CC_SANITIZE && (HAVE_SANITIZE_UNDEFINED || HAVE_SANITIZE_ADDRESS)
-	default y
-
-choice CC_SANITIZE_TYPE
-	prompt "Compiler sanitize type"
-	depends on CC_SANITIZE
-	default CC_SANITIZE_UNDEFINED if HAVE_SANITIZE_UNDEFINED
-	default CC_SANITIZE_ADDRESS if HAVE_SANITIZE_ADDRESS
-
-config CC_SANITIZE_UNDEFINED
-	bool "undefined"
-	depends on HAVE_SANITIZE_UNDEFINED
-
-config CC_SANITIZE_ADDRESS
-	bool "address"
-	depends on HAVE_SANITIZE_ADDRESS
-endchoice
-
 config MODULES
 	bool "Enable loadable module support"
 	option modules
@@ -85,6 +65,51 @@ config PREFIX
             further resources, such as loadable module support (see
             MODULES configuration help).
 
+menu "Compiler options"
+choice BUILD_TYPE
+	prompt "Build type"
+	default BUILD_TYPE_RELEASE
+
+config BUILD_TYPE_DEBUG
+	bool "debug"
+
+config BUILD_TYPE_RELEASE
+	bool "release"
+endchoice
+
+config CONFIG_CFLAGS
+       string "Arbitrary CFLAGS"
+       help
+           Sets arbitrary CFLAGS to be used across make invocations
+           without the need to be provided on every make call.
+
+config CONFIG_LDFLAGS
+       string "Arbitrary LDFLAGS"
+       help
+           Sets arbitrary LDFLAGS to be used across make invocations
+           without the need to be provided on every make call.
+
+config CC_SANITIZE
+	bool "Compiler sanitize"
+	depends on FEATURE_CC_SANITIZE && (HAVE_SANITIZE_UNDEFINED || HAVE_SANITIZE_ADDRESS)
+	default y
+
+choice CC_SANITIZE_TYPE
+	prompt "Compiler sanitize type"
+	depends on CC_SANITIZE
+	default CC_SANITIZE_UNDEFINED if HAVE_SANITIZE_UNDEFINED
+	default CC_SANITIZE_ADDRESS if HAVE_SANITIZE_ADDRESS
+
+config CC_SANITIZE_UNDEFINED
+	bool "undefined"
+	depends on HAVE_SANITIZE_UNDEFINED
+
+config CC_SANITIZE_ADDRESS
+	bool "address"
+	depends on HAVE_SANITIZE_ADDRESS
+endchoice
+endmenu
+
 endmenu
 
 menu "Core library"
diff --git a/tools/build/Makefile.vars b/tools/build/Makefile.vars
@@ -160,6 +160,9 @@ COMMON_LDFLAGS += $(SANITIZE_ADDRESS_LDFLAGS)
 endif
 endif
 
+COMMON_CFLAGS += $(patsubst "%",%,$(CONFIG_CFLAGS))
+COMMON_LDFLAGS += $(patsubst "%",%,$(CONFIG_LDFLAGS))
+
 ifneq (,$(shell echo $(COMMON_CFLAGS) | grep -e "-O[s12345\ ]"))
 COMMON_CFLAGS += $(FLTO_CFLAGS)
 endif
@@ -209,6 +212,10 @@ ifeq (y,$(SHARED_LIBRARY))
 COMMON_CFLAGS += -fPIC
 endif
 
+ifeq (y,$(BUILD_TYPE_DEBUG))
+COMMON_CFLAGS += -g
+endif
+
 COMMON_CFLAGS += -std=gnu99
 COMMON_CFLAGS += -include $(abspath $(KCONFIG_AUTOHEADER))
 COMMON_CFLAGS += -include $(abspath $(DEFINITIONS_H))
