Makefile.rules: Always use linker script from build directory

This is to ensure that external applications like rpp-test-sw build even
when they include Makefile.config copied to the rpp-lib root directory.

diff --git a/build/Makefile.rules.arm b/build/Makefile.rules.arm
index a7eb8b1e4e5727ca267d69f1cd2006264bf330e4..8c093470229957c305f894920b86500909e72276 100644 (file)
--- a/build/Makefile.rules.arm
+++ b/build/Makefile.rules.arm
@@ -63,7 +63,7 @@ RPP_LDFLAGS = \
                --generate_dead_funcs_list=$(@:%=%.deadfuncs.xml)                               \
                --stack_size=0x800
 
-RPP_LDLIBS = $(TARGET_LDCMD) -l$(RPP_LIB_DIR)/rpp-lib.lib $(TARGET_LDLIBS)
+RPP_LDLIBS = $(makefile_rules_arm_dir)/$(TARGET)/$(TARGET_LDCMD) -l$(RPP_LIB_DIR)/rpp-lib.lib $(TARGET_LDLIBS)
 
 $(RPP_LIB_DIR)/rpp-lib.lib:
        $(MAKE) -C $(dir $@)

diff --git a/build/rm48_hdk/Makefile.config b/build/rm48_hdk/Makefile.config
index 823daac46a6b5fb74b38a9b4e08f35b987407f9f..1fa7b8d766603591b9586245c1625bf7e5f75535 100644 (file)
--- a/build/rm48_hdk/Makefile.config
+++ b/build/rm48_hdk/Makefile.config
@@ -1,6 +1,4 @@
-makefile_config_dir := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-
 TARGET = rm48_hdk
 TARGET_CFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi -me -DTARGET_RM48_HDK
-TARGET_LDCMD = $(makefile_config_dir)/RM48L952FlashLnk.cmd
+TARGET_LDCMD = RM48L952FlashLnk.cmd
 TARGET_LDLIBS = --library=rtsv7R4_T_le_v3D16_eabi.lib

diff --git a/build/tms570_hdk/Makefile.config b/build/tms570_hdk/Makefile.config
index e7cd76655100c5a1740c0e77f0eaf57a690ddff7..82cff5e0e4c4f7be44aec3313cb2e5d3af973554 100644 (file)
--- a/build/tms570_hdk/Makefile.config
+++ b/build/tms570_hdk/Makefile.config
@@ -1,6 +1,4 @@
-makefile_config_dir := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-
 TARGET = tms570_hdk
 TARGET_CFLAGS = -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi -DTARGET_TMS570_HDK
-TARGET_LDCMD = $(makefile_config_dir)/TMS570LS313xFlashLnk.cmd
+TARGET_LDCMD = TMS570LS313xFlashLnk.cmd
 TARGET_LDLIBS = --library="rtsv7R4_T_be_v3D16_eabi.lib"