diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2013-02-15 11:34:02 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2013-02-18 09:16:07 +0000 |
| commit | 1bb33135e0f46369dd8ddbf8b71f87fc211511e8 (patch) | |
| tree | 4f36ff54e1d5475debcf3a475e351a715c4db1e7 | |
| parent | e5e8709cfe53db7d5348ff4673592845a8e97ad6 (diff) | |
| download | haskell-1bb33135e0f46369dd8ddbf8b71f87fc211511e8.tar.gz | |
Use $(TargetPlatformFull) instead of $(GlobalCrossCompilePrefix)
Requested by Gabor Greif.
| -rw-r--r-- | mk/config.mk.in | 1 | ||||
| -rw-r--r-- | 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 519e2856a4..0b51a15a02 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 e5e564ca00..f59a208388 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" |