Changeset 86aad6f in mainline for boot/Makefile


Ignore:
Timestamp:
2018-11-10T19:54:04Z (5 years ago)
Author:
GitHub <noreply@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc01214
Parents:
c88d91e8 (diff), 279188c (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.
git-author:
Vojtech Horky <vojtech.horky@…> (2018-11-10 19:54:04)
git-committer:
GitHub <noreply@…> (2018-11-10 19:54:04)
Message:

Add missing libs to image.iso (PR #55)

Add crt*.o files and libgcc.a to the generated image when CONFIG_DEVEL_FILES is set so we can compile again inside HelenOS.

The change is rather big because it has to find libgcc.a which is somewhere in $CROSS_PREFIX.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile

    rc88d91e8 r86aad6f  
    6565        cp -r -L "$(ROOT_PATH)/abi/include/." "$(DIST_PATH)/inc/c/"
    6666        cp -r -L "$(USPACE_PATH)/lib/c/arch/$(UARCH)/include/." "$(DIST_PATH)/inc/c/"
    67         cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
     67        cp -L "$(USPACE_PATH)/lib/c/crt0.o" "$(DIST_PATH)/lib/"
     68        cp -L "$(USPACE_PATH)/lib/c/crt1.o" "$(DIST_PATH)/lib/"
     69        cp -L "$(LIBGCC_PATH)" "$(DIST_PATH)/lib/"
    6870endif
    6971
Note: See TracChangeset for help on using the changeset viewer.