Changes in uspace/Makefile.common [1cb092d:f63a591d] in mainline

File:

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

uspace/Makefile.common

@@ -88 +88 @@
 LIBPCI_PREFIX = $(LIB_PREFIX)/pci
 
-LIBSOCKET_PREFIX = $(LIB_PREFIX)/socket
+LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
 LIBNET_PREFIX = $(LIB_PREFIX)/net
 
@@ -94 +94 @@
 
 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+
+ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
+        OPTIMIZATION = s
+else
+        OPTIMIZATION = 3
+endif
 
 .PHONY: all clean
@@ -103 +109 @@
         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(EXTRA_OUTPUT) $(EXTRA_CLEAN)
         find . -name '*.o' -follow -exec rm \{\} \;
-
-ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
-OPTIMIZATION = s
-else
-OPTIMIZATION = 3
-endif
 
 GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
@@ -115 +115 @@
         -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -Werror -pipe -g -D__$(ENDIANESS)__
+        -pipe -g -D__$(ENDIANESS)__
 
 ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
@@ -122 +122 @@
         -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -Werror -pipe -g -D__$(ENDIANESS)__
+        -pipe -g -D__$(ENDIANESS)__
 
 CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
@@ -131 +131 @@
         -pipe -g -arch $(CLANG_ARCH) -D__$(ENDIANESS)__
 
+ifeq ($(CONFIG_DEBUG),y)
+        GCC_CFLAGS += -Werror
+        ICC_CFLAGS += -Werror
+endif
+
 ## Setup platform configuration
 #
@@ -167 +172 @@
 ifneq ($(BINARY),)
 %.disasm: $(BINARY)
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        $(OBJDUMP) -d -S $< > $@
+else
         $(OBJDUMP) -d $< > $@
+endif
 
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)