diff --git a/mk/main.mk b/mk/main.mk index 3df4d3bfa5e..2e759a15972 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -190,11 +190,14 @@ endif # Target-and-rule "utility variables" ###################################################################### -define DEF_X +define DEF_FOR_TARGET X_$(1) := $(CFG_EXE_SUFFIX_$(1)) +ifndef CFG_LLVM_TARGET_$(1) +CFG_LLVM_TARGET_$(1) := $(1) +endif endef $(foreach target,$(CFG_TARGET), \ - $(eval $(call DEF_X,$(target)))) + $(eval $(call DEF_FOR_TARGET,$(target)))) # "Source" files we generate in builddir along the way. GENERATED := diff --git a/mk/rt.mk b/mk/rt.mk index a7d6a6e825f..38aec836316 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -75,7 +75,7 @@ $$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.ll $$(MKFILE_DEPS) \ @mkdir -p $$(@D) @$$(call E, compile: $$@) $$(Q)$$(LLC_$$(CFG_BUILD)) $$(CFG_LLC_FLAGS_$(1)) \ - -filetype=obj -mtriple=$(1) -relocation-model=pic -o $$@ $$< + -filetype=obj -mtriple=$$(CFG_LLVM_TARGET_$(1)) -relocation-model=pic -o $$@ $$< $$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.c $$(MKFILE_DEPS) @mkdir -p $$(@D)