diff options
author | Ian Lynagh <igloo@earth.li> | 2012-01-11 21:00:42 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2012-01-11 21:00:42 +0000 |
commit | 0b5e57e035fd5d71074f528827f425914b8e18ad (patch) | |
tree | 42d668e7c5a6f6d75301091cc743ecab44c21f5d /distrib | |
parent | ce706636d5ec8337e1bf5714e1be94e6b556d809 (diff) | |
download | haskell-0b5e57e035fd5d71074f528827f425914b8e18ad.tar.gz |
Use /usr/bin/gcc when making the OS X installer
On XCode 4.1, we use /usr/bin/gcc-4.2 as it makes better code than
/usr/bin/gcc for us. However, gcc-4.2 doesn't exist in XCode 4.2, so we
need to use /usr/bin/gcc there. As the installer can be used on either,
we make it always use /usr/bin/gcc.
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 738c68eded..471893cb2b 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 = "case \"$ACTION\" in clean) rm -rf \"$GHC_UNPACKS_INTO\" ;; build) tar -jxf \"$BINDIST\" && cd \"$GHC_UNPACKS_INTO\" && ./configure --prefix=\"$INSTALL_PATH/$CONTENTS_FOLDER_PATH/usr\" ;; install) cd \"$GHC_UNPACKS_INTO\" && make install DESTDIR=\"$DSTROOT\" ;; *) echo \"Unknown action $ACTION\" >&2 ; exit 1 ;; esac "; + shellScript = "case \"$ACTION\" in clean) rm -rf \"$GHC_UNPACKS_INTO\" ;; build) tar -jxf \"$BINDIST\" && cd \"$GHC_UNPACKS_INTO\" && ./configure --prefix=\"$INSTALL_PATH/$CONTENTS_FOLDER_PATH/usr\" --with-gcc=/usr/bin/gcc --with-gcc-4.2=/usr/bin/gcc ;; install) cd \"$GHC_UNPACKS_INTO\" && make install DESTDIR=\"$DSTROOT\" ;; *) echo \"Unknown action $ACTION\" >&2 ; exit 1 ;; esac "; }; E76B00450D52DFDB00A05A2F /* ShellScript */ = { isa = PBXShellScriptBuildPhase; |