Changeset 32573ff in mainline for boot/Makefile.common

Timestamp:

2016-05-02T20:58:16Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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.

Message:

Merge mainline, which has dltest and fixes.

File:

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

boot/Makefile.common

@@ -160 +160 @@
                 $(USPACE_PATH)/lib/c/libc.so.0 \
                 $(USPACE_PATH)/lib/softint/libsoftint.so.0 \
-                $(USPACE_PATH)/lib/math/libmath.so.0
-        RD_APPS += \
-                $(USPACE_PATH)/app/dltest/dltest
+                $(USPACE_PATH)/lib/math/libmath.so.0 \
+                $(USPACE_PATH)/lib/dltest/libdltest.so.0
 endif
 
@@ -225 +224 @@
         $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant
 
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+        RD_APPS_NON_ESSENTIAL += \
+                $(USPACE_PATH)/app/dltest/dltest
+endif
+
 RD_TESTS = \
         $(USPACE_PATH)/lib/c/test-libc \