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

Changeset 729f774f in mainline for uspace/Makefile.common


Ignore:
Timestamp:
2011-04-30T16:12:19Z (11 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
15b3761
Parents:
4ddbea7
Message:

Merge linker script sources for shared libs and dynamicaly linked executables
into the default one.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile.common

    r4ddbea7 r729f774f  
    101101BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.a
    102102LFLAGS = -Bdynamic
    103 LINKER_SCRIPT ?= $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld
     103LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    104104else
    105105BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
     
    217217endif
    218218
    219 $(LOUTPUT): $(LARCHIVE) $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
    220         $(LD) -T $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld $(LIB_LFLAGS) $(LARCHIVE) -o $@ -Map $(LOUTPUT).map
     219$(LOUTPUT): $(LARCHIVE) $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
     220        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld $(LIB_LFLAGS) $(LARCHIVE) -o $@ -Map $(LOUTPUT).map
    221221endif
    222222
Note: See TracChangeset for help on using the changeset viewer.