/branches/dynload/uspace/lib/libc/Makefile.app |
---|
29,7 → 29,7 |
## Common configuration for applications |
# |
ifeq ($(CONFIG_SHARED_LIBC),y) |
ifeq ($(CONFIG_USE_SHARED_LIBC),y) |
LFLAGS := -Bdynamic -I/app/dload -rpath-link $(RTLD_PREFIX) |
LIBS = $(LIBC_PREFIX)/shared/libc.so.0 |
LD_SCRIPT = $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld |
/branches/dynload/uspace/lib/libc/Makefile |
---|
106,9 → 106,15 |
OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS) |
PIC_OBJECTS := $(addsuffix .pio,$(basename $(OBJECTS))) |
OUTPUT := libc.a |
ifeq ($(CONFIG_BUILD_SHARED_LIBC), y) |
OUTPUT += libc.pic.a |
endif |
.PHONY: all clean depend kerninc |
all: kerninc libc.a libc.pic.a arch/$(UARCH)/_link.ld |
all: kerninc $(OUTPUT) arch/$(UARCH)/_link.ld |
kerninc: |
ln -sfn ../../../../kernel/generic/include include/kernel |
/branches/dynload/uspace/Makefile |
---|
37,7 → 37,6 |
lib/libblock \ |
lib/softint \ |
lib/softfloat \ |
lib/libc/shared \ |
lib/libtest \ |
srv/ns \ |
srv/loader \ |
51,7 → 50,6 |
srv/devmap \ |
app/tetris \ |
app/tester \ |
app/dltest \ |
app/dltest2 \ |
app/dload \ |
app/trace \ |
73,6 → 71,13 |
srv/obio |
endif |
ifeq ($(CONFIG_SHARED_LIBC), y) |
DIRS += \ |
lib/libc/shared |
app/dltest |
endif |
BUILDS := $(addsuffix .build,$(DIRS)) |
CLEANS := $(addsuffix .clean,$(DIRS)) |
/branches/dynload/HelenOS.config |
---|
463,5 → 463,9 |
% External ramdisk |
! [PLATFORM=sparc64] CONFIG_RD_EXTERNAL (y/n) |
% Use shared C library |
! CONFIG_SHARED_LIBC (y/n) |
% Build shared C library |
! CONFIG_BUILD_SHARED_LIBC (y/n) |
% Link against shared C library |
! [CONFIG_BUILD_SHARED_LIBC=y] CONFIG_USE_SHARED_LIBC (n/y) |
! [CONFIG_BUILD_SHARED_LIBC=n] CONFIG_USE_SHARED_LIBC (n) |
/branches/dynload/boot/arch/ia32/Makefile.inc |
---|
53,7 → 53,6 |
RD_APPS = \ |
$(USPACEDIR)/app/tetris/tetris \ |
$(USPACEDIR)/app/tester/tester \ |
$(USPACEDIR)/app/dltest/dltest \ |
$(USPACEDIR)/app/dltest2/dltest2 \ |
$(USPACEDIR)/app/dload/dload \ |
$(USPACEDIR)/app/trace/trace \ |
61,9 → 60,13 |
$(USPACEDIR)/app/bdsh/bdsh |
RD_LIBS = \ |
$(USPACEDIR)/lib/libc/shared/libc.so.0 \ |
$(USPACEDIR)/lib/libtest/libtest.so.0 |
ifeq ($(CONFIG_BUILD_SHARED_LIBC), y) |
RD_LIBS += $(USPACEDIR)/lib/libc/shared/libc.so.0 |
RD_APPS += $(USPACEDIR)/app/dltest/dltest |
endif |
build: $(BASE)/image.iso |
$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS) |