Use $(TargetPlatformFull) instead of $(GlobalCrossCompilePrefix)
authorSimon Marlow <marlowsd@gmail.com>
Fri, 15 Feb 2013 11:34:02 +0000 (11:34 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Mon, 18 Feb 2013 09:16:07 +0000 (09:16 +0000)
Requested by Gabor Greif.

mk/config.mk.in
mk/custom-settings.mk

index 519e285..0b51a15 100644 (file)
@@ -546,7 +546,6 @@ GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
 
 WhatGccIsCalled       = @WhatGccIsCalled@
 GccVersion            = @GccVersion@
-GlobalCrossCompilePrefix = @CrossCompilePrefix@
 ifeq "$(phase)" "0"
 CrossCompilePrefix    =
 else
index e5e564c..f59a208 100644 (file)
@@ -5,7 +5,7 @@ ifeq "$(Validating)" "YES"
 include mk/validate-settings.mk
 -include mk/validate.mk
 else
--include $(firstword $(wildcard mk/$(GlobalCrossCompilePrefix)build.mk) mk/build.mk)
+-include $(firstword $(wildcard mk/$(TargetPlatformFull)-build.mk) mk/build.mk)
 endif
 
 ifeq "$(BINDIST)" "YES"