Changes in uspace/Makefile.common [cbd64057:4fb794c] in mainline

File:

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

uspace/Makefile.common

@@ -103 +103 @@
 
 LIBC_PREFIX = $(LIB_PREFIX)/c
+LIBC_INCLUDES_FLAGS = \
+        -I$(LIBC_PREFIX)/include \
+        -I$(LIBC_PREFIX)/arch/$(UARCH)/include \
+        -I$(ROOT_PATH)/abi/include
 LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
@@ -132 +136 @@
 
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
-
-LIBGPT_PREFIX = $(LIB_PREFIX)/gpt
 
 LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
@@ -182 +184 @@
         find . -name '*.lo' -follow -exec rm \{\} \;
 
-GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+GCC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
         -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
         -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -g -D__$(ENDIANESS)__
-
-ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -pipe -ggdb -D__$(ENDIANESS)__
+
+ICC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -196 +198 @@
         -pipe -g -D__$(ENDIANESS)__
 
-CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
-        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
+# clang does not support following options but I am not sure whether
+# something won't break because of that:
+# -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) -finput-charset=UTF-8
+CLANG_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -ffreestanding -fno-builtin -nostdlib -nostdinc \
         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -g -arch $(CLANG_ARCH) -D__$(ENDIANESS)__
+        -integrated-as \
+        -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
 
 LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
@@ -249 +254 @@
 ifeq ($(COMPILER),clang)
         CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        GCC_CFLAGS += $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
@@ -301 +307 @@
 
 %.o: %.S $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__