Skip to content

Commit 19a8791

Browse files
allow override of linker script for apps
1 parent 80405df commit 19a8791

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

src/makefile.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@ UPDIR_RM = $(subst _../,../,$(subst \,/,$1))
124124
CC_DEBUG = -DNDEBUG=1
125125
LD_DEBUG = --defsym NDEBUG=1
126126

127-
# linker script
128-
LINKER_SCRIPT ?= $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/meta/linker_script.ld)
129-
130127
# allocator (malloc/realloc/free)
131128
ifeq ($(ALLOCATOR),STANDARD)
132129
LIB_ALLOCATOR = $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/lib/libc/allocator_standard.a)
@@ -241,12 +238,13 @@ LD_EMIT_RELOCS = --emit-relocs
241238
LOAD_ADDR = 0x000000
242239
TARGET = $(NAME).8ek
243240
CRT0_APPLICATION = -DHAS_APPLICATION=1
244-
LINKER_SCRIPT = $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/meta/linker_script_app.ld)
241+
LINKER_SCRIPT ?= $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/meta/linker_script_app.ld)
245242
CONVBINFLAGS += -k 8ek
246243
ifneq ($(APPLICATION_DESCRIPTION),)
247244
CONVBINFLAGS += -d $(APPLICATION_DESCRIPTION)
248245
endif
249246
else
247+
LINKER_SCRIPT ?= $(call FORWARD_PATH,$(CEDEV_TOOLCHAIN)/meta/linker_script.ld)
250248
LD_EMIT_RELOCS =
251249
ifeq ($(ARCHIVED),YES)
252250
CONVBINFLAGS += -r

0 commit comments

Comments
 (0)