Changeset 8416d46 in mainline for uspace/srv/Makefile.common

Timestamp:

2010-01-17T11:01:31Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3e30c0b

Parents:

ccb785b

Message:

Fix loader not using the correct linker script.

File:

• uspace/srv/Makefile.common (modified) (3 diffs)

uspace/srv/Makefile.common

@@ -50 +50 @@
 SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint
 
+LINK_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+
 JOB = $(OUTPUT).job
 
@@ -67 +69 @@
     $(LIBS) \
     \
-    $(OUTPUT) $(OUTPUT).disasm
+    $(OUTPUT) $(OUTPUT).disasm \
+    $(EXTRA_OUTPUT)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(EXTRA_OUTPUT)
         find . -name '*.o' -follow -exec rm \{\} \;
 
@@ -82 +85 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+        $(LD) -T $(LINK_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 %.o: %.c $(DEPEND)