[commit: ghc] master: Use $(TargetPlatformFull) instead of $(GlobalCrossCompilePrefix) (1bb3313)

Simon Marlow marlowsd at gmail.com
Mon Feb 18 11:43:40 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1bb33135e0f46369dd8ddbf8b71f87fc211511e8

>---------------------------------------------------------------

commit 1bb33135e0f46369dd8ddbf8b71f87fc211511e8
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Feb 15 11:34:02 2013 +0000

    Use $(TargetPlatformFull) instead of $(GlobalCrossCompilePrefix)
    
    Requested by Gabor Greif.

>---------------------------------------------------------------

 mk/config.mk.in       |    1 -
 mk/custom-settings.mk |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 519e285..0b51a15 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -546,7 +546,6 @@ 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 e5e564c..f59a208 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 $(firstword $(wildcard mk/$(GlobalCrossCompilePrefix)build.mk) mk/build.mk)
+-include $(firstword $(wildcard mk/$(TargetPlatformFull)-build.mk) mk/build.mk)
 endif
 
 ifeq "$(BINDIST)" "YES"





More information about the ghc-commits mailing list