diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-09-27 15:05:07 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-09-27 15:05:07 +0000 |
| commit | ceaa86e8b5fe1c852a21ecf15b46ea400572b4bc (patch) | |
| tree | 424ab6f1f571d15a7ddce4fef0bf443b7f854a5a /distrib | |
| parent | 14bdc03c521a1fa64ea8183553ec9d5ff158ff5b (diff) | |
| download | haskell-ceaa86e8b5fe1c852a21ecf15b46ea400572b4bc.tar.gz | |
Fix making OS X installers from source tarballs
I'm not sure why it works in the HEAD, but when making an installer
from the 6.10.1 beta configure hangs when doing the CHECK_HIST_ERRORS
test (during rl_initialize, I believe). Giving make /dev/null as stdin
fixes it.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/MacOS/GHC.xcodeproj/project.pbxproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/distrib/MacOS/GHC.xcodeproj/project.pbxproj b/distrib/MacOS/GHC.xcodeproj/project.pbxproj index 771dad9ccb..a07929ce18 100644 --- a/distrib/MacOS/GHC.xcodeproj/project.pbxproj +++ b/distrib/MacOS/GHC.xcodeproj/project.pbxproj @@ -152,7 +152,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# We need to be at the top of the ghc tree\ncd ../..\n\nPREFIX=${INSTALL_PATH}/${CONTENTS_FOLDER_PATH}/usr\n\nif [ ${ACTION} = build ]; then\n # put explicit --prefix last, in case the extra configure args contain a prefix\n ./configure ${XCODE_EXTRA_CONFIGURE_ARGS} --prefix=${PREFIX} || exit 1\n MAKE_ACTION=\n DOCS_ACTION=html\nelse\n MAKE_ACTION=${ACTION}\n DOCS_ACTION=install-docs\nfi\n\n# - Yes, it's the vanilla install target that must see HADDOCK_DOCS=YES, not the install-docs target.\n# - We must explictly force the creation of a symbol table in .a files on BSD, and not all versions of Cabal\n# do that consistently; hence, the EXTRA_AR_ARGS.\nmake DESTDIR=${DSTROOT} HADDOCK_DOCS=YES EXTRA_AR_ARGS=-s ${MAKE_ACTION} || exit 1\nmake DESTDIR=${DSTROOT} XMLDocWays=html ${DOCS_ACTION} || exit 1"; + shellScript = "# We need to be at the top of the ghc tree\ncd ../..\n\nPREFIX=${INSTALL_PATH}/${CONTENTS_FOLDER_PATH}/usr\n\nif [ ${ACTION} = build ]; then\n # put explicit --prefix last, in case the extra configure args contain a prefix\n ./configure ${XCODE_EXTRA_CONFIGURE_ARGS} --prefix=${PREFIX} || exit 1\n MAKE_ACTION=\n DOCS_ACTION=html\nelse\n MAKE_ACTION=${ACTION}\n DOCS_ACTION=install-docs\nfi\n\n# - Yes, it's the vanilla install target that must see HADDOCK_DOCS=YES, not the install-docs target.\n# - We must explictly force the creation of a symbol table in .a files on BSD, and not all versions of Cabal\n# do that consistently; hence, the EXTRA_AR_ARGS.\nmake DESTDIR=${DSTROOT} HADDOCK_DOCS=YES EXTRA_AR_ARGS=-s ${MAKE_ACTION} < /dev/null || exit 1\nmake DESTDIR=${DSTROOT} XMLDocWays=html ${DOCS_ACTION} || exit 1"; }; E76B00450D52DFDB00A05A2F /* ShellScript */ = { isa = PBXShellScriptBuildPhase; |