summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-02-03 15:43:16 +0000
committerIan Lynagh <ian@well-typed.com>2013-02-03 15:43:16 +0000
commit2a06453810ce0043a9f07201c5aa800c308ba065 (patch)
tree02925179a588b508ccd8593bc3e9d1cb55185519
parentd034b5ac83fa111a9aea4f6ace32c52ece711832 (diff)
parent40d2ec8d828efcfd3bb4a19e5971a028d567ed8d (diff)
downloadhaskell-2a06453810ce0043a9f07201c5aa800c308ba065.tar.gz
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
-rw-r--r--configure.ac7
-rw-r--r--mk/config.mk.in1
2 files changed, 0 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 29b240fea9..b7cd351919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -470,12 +470,6 @@ TargetPlatformFull="${target}"
AC_SUBST(CrossCompiling)
AC_SUBST(CrossCompilePrefix)
AC_SUBST(TargetPlatformFull)
-AC_ARG_WITH([alien],
-[AC_HELP_STRING([--with-alien=ARG],
- [Supply script for running target binaries locally when cross-compiling])],
- [AlienScript="$withval"],
- [AlienScript=""])
-AC_SUBST(AlienScript)
dnl ** Which gcc to use?
dnl --------------------------------------------------------------
@@ -993,7 +987,6 @@ echo ["\
Using GCC : $WhatGccIsCalled
which is version : $GccVersion
Building a cross compiler : $CrossCompiling
- Alien script : $AlienScript
ld : $LdCmd
Happy : $HappyCmd ($HappyVersion)
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 0048620a20..e40f569958 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -571,7 +571,6 @@ GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
WhatGccIsCalled = @WhatGccIsCalled@
GccVersion = @GccVersion@
-AlienScript = @AlienScript@
ifeq "$(phase)" "0"
CrossCompilePrefix =
else