Changeset fd68aaf in mainline for uspace/Makefile.common

Timestamp:

2018-01-08T19:24:12Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

61c9ee2 (diff), c9e09f2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-08 19:24:12)

git-committer:

GitHub <noreply@…> (2018-01-08 19:24:12)

Message:

Merge c9e09f26171e31413438891ef35603df24ce8ac7 into 61c9ee245ce76e905057b74bba2180046d9fb85e

File:

• uspace/Makefile.common (modified) (2 diffs)

uspace/Makefile.common

@@ -174 +174 @@
 endif
 
-COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -ffreestanding -fno-builtin -nostdlib -nostdinc -fexec-charset=UTF-8 \
-        -finput-charset=UTF-8 -D__$(ENDIANESS)__ -fno-common \
+# Flags that are not necessary, and can be overriden, but are used by default.
+DEFAULT_CFLAGS = \
+        -O$(OPTIMIZATION) \
+        -ffunction-sections \
+        -pipe \
+        -Wall \
+        -Wextra \
+        -Wno-unused-parameter \
+        -Wmissing-prototypes \
+        -Wwrite-strings \
+        -Werror-implicit-function-declaration
+
+ifeq ($(CONFIG_DEBUG),y)
+        DEFAULT_CFLAGS += -Werror
+endif
+
+ifeq ($(COMPILER),clang)
+        DEFAULT_CFLAGS += \
+                -Wno-missing-field-initializers \
+                -Wno-typedef-redefinition \
+                -Wno-unused-command-line-argument
+else
+        DEFAULT_CFLAGS += \
+                -Wno-clobbered
+endif
+
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        DEFAULT_CFLAGS += -ggdb
+endif
+
+# Flags that should always be used, even for third-party software.
+COMMON_CFLAGS = \
+        -ffreestanding \
+        -fno-builtin \
+        -nostdlib \
+        -nostdinc \
+        -D__$(ENDIANESS)__
+
+# Flags that are always used for HelenOS code, but not for third-party.
+HELENOS_CFLAGS = \
+        -std=gnu99 \
+        $(INCLUDES_FLAGS) \
+        -imacros $(CONFIG_HEADER) \
+        -fexec-charset=UTF-8 \
+        -finput-charset=UTF-8 \
+        -fno-common \
         -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
 
-GCC_CFLAGS = -ffunction-sections -Wall -Wextra -Wno-clobbered \
-        -Wno-unused-parameter -Wmissing-prototypes -std=gnu99 \
-        -Werror-implicit-function-declaration \
-        -Wwrite-strings -pipe
-
-# -Wno-missing-prototypes is there because it warns about main().
-# This should be fixed elsewhere.
-CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-typedef-redefinition \
-        -Wno-missing-prototypes -Wno-unused-command-line-argument \
-        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -fno-stack-protector -fno-PIC
-
-ifeq ($(CONFIG_DEBUG),y)
-        COMMON_CFLAGS += -Werror
-endif
-
-ifeq ($(CONFIG_LINE_DEBUG),y)
-        GCC_CFLAGS += -ggdb
-        CLANG_CFLAGS += -g
-endif
+# TODO: Use a different name.
+# CFLAGS variable is traditionally used for overridable flags.
+CFLAGS = $(COMMON_CFLAGS) $(HELENOS_CFLAGS) $(DEFAULT_CFLAGS)
 
 ## Setup platform configuration
@@ -214 +240 @@
 else
         CC_JOB = $(CC) $< -o $@
-endif
-
-ifeq ($(COMPILER),clang)
-        CFLAGS += $(COMMON_CFLAGS) $(CLANG_CFLAGS)
-else
-        CFLAGS += $(COMMON_CFLAGS) $(GCC_CFLAGS)
 endif