Skip to content
Permalink
Browse files

Build for x86_64 instead of i386.

Make the "Disk Image" directory in case it doesn't exist already.
  • Loading branch information
mihaip committed Dec 7, 2010
1 parent 8d9543c commit 81f28c9bb6dd2fe278c0c0db4f70e19e3afb2d52
Showing with 4 additions and 4 deletions.
  1. +3 −4 build.sh
  2. +1 −0 build_package_test_and_bundle.sh
@@ -25,10 +25,9 @@ pushd git_build
cat Makefile >> Makefile_tmp
mv Makefile_tmp Makefile

# Make fat binaries with ppc/32 bit/64 bit
make CFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" LDFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" prefix=$PREFIX all
make CFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" LDFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" prefix=$PREFIX strip
$SUDO make CFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" LDFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" prefix=$PREFIX install
make CFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" LDFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" prefix=$PREFIX all
make CFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" LDFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" prefix=$PREFIX strip
$SUDO make CFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" LDFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch x86_64" prefix=$PREFIX install

# contrib
$SUDO mkdir -p $PREFIX/contrib/completion
@@ -12,6 +12,7 @@ IMAGE_FILENAME="git-$GIT_VERSION-intel-leopard.dmg"
echo $PACKAGE_NAME | pbcopy
echo "Git version is $GIT_VERSION"

mkdir Disk\ Image
/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker --doc Git\ Installer.pmdoc/ -o Disk\ Image/git-$GIT_VERSION-intel-leopard.pkg --title "Git $GIT_VERSION"

echo "Testing the installer..."

0 comments on commit 81f28c9

Please sign in to comment.
You can’t perform that action at this time.