summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/config.mk.in1
-rw-r--r--mk/custom-settings.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 987ee32808..0fc3a1da8a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -571,6 +571,7 @@ GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
WhatGccIsCalled = @WhatGccIsCalled@
GccVersion = @GccVersion@
+GlobalCrossCompilePrefix = @CrossCompilePrefix@
ifeq "$(phase)" "0"
CrossCompilePrefix =
else
diff --git a/mk/custom-settings.mk b/mk/custom-settings.mk
index e64bb36561..e5e564ca00 100644
--- a/mk/custom-settings.mk
+++ b/mk/custom-settings.mk
@@ -5,7 +5,7 @@ ifeq "$(Validating)" "YES"
include mk/validate-settings.mk
-include mk/validate.mk
else
--include mk/build.mk
+-include $(firstword $(wildcard mk/$(GlobalCrossCompilePrefix)build.mk) mk/build.mk)
endif
ifeq "$(BINDIST)" "YES"