Skip to content

P
protobuf
Commit 62903ec0 authored by Kun Zhang's avatar Kun Zhang
Browse files
Options

Make the osx binary compatible with 10.7 and later

parent 5c265fae
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
protoc-artifacts/build-protoc.sh
View file @ 62903ec0
...@@ -106,7 +106,7 @@ checkDependencies () ...@@ -106,7 +106,7 @@ checkDependencies ()
fi fi
elif [[ "$OS" == osx ]]; then elif [[ "$OS" == osx ]]; then
dump_cmd='otool -L '"$1"' | fgrep dylib' dump_cmd='otool -L '"$1"' | fgrep dylib'
white_list="libz\.1\.dylib\|libc++\.1\.dylib\|libSystem\.B\.dylib" white_list="libz\.1\.dylib\|libstdc++\.6\.dylib\|libSystem\.B\.dylib"
fi fi
if [[ -z "$white_list" || -z "$dump_cmd" ]]; then if [[ -z "$white_list" || -z "$dump_cmd" ]]; then
fail "Unsupported platform $OS-$ARCH." fail "Unsupported platform $OS-$ARCH."
...@@ -184,6 +184,8 @@ elif [[ "$(uname)" == Linux* ]]; then ...@@ -184,6 +184,8 @@ elif [[ "$(uname)" == Linux* ]]; then
fi fi
elif [[ "$(uname)" == Darwin* ]]; then elif [[ "$(uname)" == Darwin* ]]; then
assertEq "$OS" osx $LINENO assertEq "$OS" osx $LINENO
# Make the binary compatible with OSX 10.7 and later
CXXFLAGS="$CXXFLAGS -mmacosx-version-min=10.7"
if [[ "$ARCH" == x86_64 ]]; then if [[ "$ARCH" == x86_64 ]]; then
CXXFLAGS="$CXXFLAGS -m64" CXXFLAGS="$CXXFLAGS -m64"
elif [[ "$ARCH" == x86_32 ]]; then elif [[ "$ARCH" == x86_32 ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment