Changeset a8010272 in mainline for boot

Timestamp:

2011-07-23T22:56:29Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

e76e833f

Parents:

7fc9820

Message:

Added support for development files inclusion (headers, libraries, linker scripts).

Location:

boot

Files:

• Makefile (modified) (2 diffs)
• Makefile.common (modified) (1 diff)

boot/Makefile

@@ -58 +58 @@
                 cp "$$file" "$(DIST_PATH)/lib/" ; \
         done
+ifeq ($(CONFIG_DEVEL_FILES), y)
+        mkdir "$(DIST_PATH)/inc/c/"
+        cp -r -L "$(USPACE_PATH)/lib/c/include/." "$(DIST_PATH)/inc/c/"
+        cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
+endif
         for file in $(RD_APPS) ; do \
                 cp "$$file" "$(DIST_PATH)/app/" ; \
@@ -91 +96 @@
         rm -rf $(USPACE_PATH)/dist/drv/*
         rm -f $(USPACE_PATH)/dist/lib/*
+        rm -rf $(USPACE_PATH)/dist/inc/*
         rm -f $(USPACE_PATH)/dist/app/*
         rm -f $(USPACE_PATH)/dist/cfg/net/*

boot/Makefile.common

@@ -121 +121 @@
 
 RD_LIBS =
+
+ifeq ($(CONFIG_DEVEL_FILES), y)
+        RD_LIBS += \
+                $(USPACE_PATH)/lib/c/libc.a \
+                $(USPACE_PATH)/lib/softint/libsoftint.a \
+                $(USPACE_PATH)/lib/softfloat/libsoftfloat.a
+endif
 
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)