Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 3f461ecf in mainline for uspace/lib/c/Makefile


Ignore:
Timestamp:
2011-04-30T13:23:34Z (11 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
a41577e, f798178
Parents:
afdcc60e (diff), 28c4ca7 (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 loader / linker script improvements.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/Makefile

    rafdcc60e r3f461ecf  
    4141CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    4242
     43LINKER_SCRIPTS = \
     44        $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld \
     45        $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld
     46
    4347PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
    44 EXTRA_OUTPUT = $(LINKER_SCRIPT)
    45 EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
     48EXTRA_OUTPUT = $(LINKER_SCRIPTS)
     49EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    4650LIBRARY = libc
    4751
     
    133137        ln -sfn ../$< $@
    134138
    135 $(LINKER_SCRIPT): $(LINKER_SCRIPT).in
     139$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    136140        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
     141
     142$(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
     143        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
    137144
    138145$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
Note: See TracChangeset for help on using the changeset viewer.