Changeset 9d8b12da in mainline for uspace/Makefile.common

Timestamp:

2017-11-08T22:43:39Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

378948d

Parents:

d2e7a51

Message:

Instead of setting MATH=y, just list 'math' in dependencies like a normal library.

File:

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

uspace/Makefile.common

@@ -44 +44 @@
 #   EXTRA_CLEAN        additional cleanup targets
 #
-#   MATH               set to 'y' to use the math library
 #   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
 #
@@ -140 +139 @@
 ifeq ($(STATIC_BUILD),y)
         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
-        ifeq ($(MATH),y)
-                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
-        endif
 else
         BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
         LINK_DYNAMIC = y
-        ifeq ($(MATH),y)
-                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so.0
-        endif
 endif
 
@@ -168 +161 @@
 LIB_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
 
-ifeq ($(MATH),y)
-        INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) $(LIBMATH_INCLUDES_FLAGS)
-else
-        INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
-endif
+INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
 
 ifneq ($(LIBRARY),)
@@ -179 +168 @@
 
 INCLUDES_FLAGS += $(foreach lib,$(LIBS), -I$(LIB_PREFIX)/$(lib) -I$(LIB_PREFIX)/$(lib)/include)
+
+# TODO: get rid of this special case
+ifneq ($(filter math, $(LIBS)),)
+        INCLUDES_FLAGS += $(LIBMATH_INCLUDES_FLAGS)
+endif
 
 # PCUT-based unit tests