From c5a2a7c3dba6a90a52689277d5a4eb08a5a383d2 Mon Sep 17 00:00:00 2001
From: Kun Zhang <zhangkun@google.com>
Date: Mon, 6 Apr 2015 14:31:29 -0700
Subject: Process to deploy artifacts for multiple platforms into a single
 release.

- Do not close the staging repository automatically
- Added staging.repository property
- Updated README with instructions for deployment
- Fix building 32-bit Mac artifact
---
 protoc-artifacts/build-protoc.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'protoc-artifacts/build-protoc.sh')

diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh
index 50c4b349..714b1bec 100755
--- a/protoc-artifacts/build-protoc.sh
+++ b/protoc-artifacts/build-protoc.sh
@@ -71,7 +71,13 @@ checkArch ()
     fi
   elif [[ "$OS" == osx ]]; then
     format="$(file -b "$1" | grep -o "[^ ]*$")"
-    assertEq $format "x86_64" $LINENO
+    if [[ "$ARCH" == x86_32 ]]; then
+      assertEq $format "i386" $LINENO
+    elif [[ "$ARCH" == x86_64 ]]; then
+      assertEq $format "x86_64" $LINENO
+    else
+      fail "Unsupported arch: $ARCH"
+    fi
   else
     fail "Unsupported system: $(uname)"
   fi
@@ -120,6 +126,13 @@ elif [[ "$(uname)" == Linux* ]]; then
   fi
 elif [[ "$(uname)" == Darwin* ]]; then
   assertEq "$OS" osx $LINENO
+  if [[ "$ARCH" == x86_64 ]]; then
+    CXXFLAGS="$CXXFLAGS -m64"
+  elif [[ "$ARCH" == x86_32 ]]; then
+    CXXFLAGS="$CXXFLAGS -m32"
+  else
+    fail "Unsupported arch: $ARCH"
+  fi
 else
   fail "Unsupported system: $(uname)"
 fi
-- 
cgit v1.2.3