Skip to content
This repository was archived by the owner on Nov 13, 2023. It is now read-only.

Commit d0f138a

Browse files
committed
v2.0.1
1 parent ae47d7a commit d0f138a

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

build.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/bash -x
22

33
. env.sh
44

@@ -15,8 +15,9 @@ $SUDO mv $PREFIX{,_`date +%s`} || echo "Git not installed currently"
1515

1616
mkdir -p git_build
1717

18-
export CFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch i386 -arch x86_64"
19-
export LDFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch i386 -arch x86_64"
18+
export TARGET_FLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -DMACOSX_DEPLOYMENT_TARGET=10.6"
19+
export CFLAGS="$TARGET_FLAGS -arch i386 -arch x86_64"
20+
export LDFLAGS="$TARGET_FLAGS -arch i386 -arch x86_64"
2021

2122
export C_INCLUDE_PATH=/usr/include
2223
export CPLUS_INCLUDE_PATH=/usr/include
@@ -41,7 +42,7 @@ pushd git_build
4142

4243
# git-credential-osxkeychain
4344
pushd contrib/credential/osxkeychain
44-
CFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch x86_64" LDFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch x86_64" make
45+
CFLAGS="$TARGET_FLAGS -arch x86_64" LDFLAGS="$TARGET_FLAGS -arch x86_64" make
4546
$SUDO cp git-credential-osxkeychain $PREFIX/bin/git-credential-osxkeychain
4647
popd
4748
popd

build_package_test_and_bundle.sh

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ rm -f Disk\ Image/*.pkg
1010
if [ "`uname`" == "Darwin" ]; then sed_regexp="-E"; else sed_regexp="-r"; fi
1111
GIT_VERSION="${1:-`curl http://git-scm.com/ 2>&1 | grep '<span class="version">' -A 1 | tail -n 1 | sed $sed_regexp 's/ *//'`}"
1212

13+
echo $GIT_VERSION
1314
./build.sh $GIT_VERSION
1415

1516
PACKAGE_NAME="git-$GIT_VERSION-intel-universal-snow-leopard"

git-manpages

Submodule git-manpages updated from 8e0f4d7 to 67adeb7

0 commit comments

Comments
 (0)