Skip to content

Commit

Permalink
Makefile.rules_generic: Stop allowing app custom SCRIPT_LD
Browse files Browse the repository at this point in the history
  • Loading branch information
Xavier Chapron committed Nov 29, 2023
1 parent 4b49352 commit f2add68
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions Makefile.rules_generic
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,20 @@ $(OBJ_DIR)/%.o: %.S $(BUILD_DEPENDENCIES) prepare
@echo "[AS] $@"
$(L)$(call as_cmdline,$(INCLUDES_PATH), $(DEFINES),$<,$@)

ifeq ($(SCRIPT_LD),)
ifneq ($(SCRIPT_LD),)
ifneq ($(ENABLE_SDK_WERROR),0)
$(error Deprecated SCRIPT_LD setting)
else
$(warning Deprecated SCRIPT_LD setting)
endif
endif
LDFLAGS += -L$(BOLOS_SDK)/target/$(TARGET)
ifeq ($(IS_PLUGIN),)
SCRIPT_LD := $(BOLOS_SDK)/target/$(TARGET)/script.ld
else
SCRIPT_LD := $(BOLOS_SDK)/target/$(TARGET)/plugin_script.ld
$(info Using plugin link script: $(SCRIPT_LD))
endif
else
$(info Using custom link script: $(SCRIPT_LD))
endif
LDFLAGS += -T$(SCRIPT_LD)

$(LINK_DEPENDENCIES): prepare
Expand Down

0 comments on commit f2add68

Please sign in to comment.