arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [arrow] branch master updated: ARROW-1766: [GLib] Fix failing builds on OSX
Date Fri, 03 Nov 2017 16:15:13 GMT
This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 0373541  ARROW-1766: [GLib] Fix failing builds on OSX
0373541 is described below

commit 0373541e2e9cd3510d6e4c8ac5b580f11eb675ec
Author: Phillip Cloud <cpcloud@gmail.com>
AuthorDate: Fri Nov 3 17:10:30 2017 +0100

    ARROW-1766: [GLib] Fix failing builds on OSX
    
    Author: Phillip Cloud <cpcloud@gmail.com>
    
    Closes #1279 from cpcloud/ARROW-1766 and squashes the following commits:
    
    ed3b22b [Phillip Cloud] Only set ARCHFLAGS on osx
    d9c1604 [Phillip Cloud] [GLib] Fix failing builds on OSX
---
 ci/travis_before_script_c_glib.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh
index a63945e..a22ecd3 100755
--- a/ci/travis_before_script_c_glib.sh
+++ b/ci/travis_before_script_c_glib.sh
@@ -100,7 +100,12 @@ if [ $BUILD_SYSTEM = "autotools" ]; then
 
   ./configure $CONFIGURE_OPTIONS
 
-  make -j4
+  if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    ARCHFLAGS="-arch x86_64" make -j4
+  else
+    make -j4
+  fi
+
   make install
 else
   MESON_OPTIONS="--prefix=$ARROW_C_GLIB_INSTALL"

-- 
To stop receiving notification emails like this one, please contact
['"commits@arrow.apache.org" <commits@arrow.apache.org>'].

Mime
View raw message