From be44ee078fa5d5470dddd097db0d97fadfc754ff Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 11 Feb 2015 16:19:32 +0200 Subject: Update Mac OS X binary build --- binary/darwin/build-dist | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'binary/darwin/build-dist') diff --git a/binary/darwin/build-dist b/binary/darwin/build-dist index ccbe0a7..434ba82 100755 --- a/binary/darwin/build-dist +++ b/binary/darwin/build-dist @@ -14,7 +14,7 @@ function error () rebuild=n -arch=i686-apple-darwin8 +arch=i686-apple-darwin10 rebuild=n while [ $# -gt 0 ]; do @@ -44,9 +44,7 @@ mver=`echo $over | sed -e 's%\([0-9]*\.[0-9]*\).*%\1%'` install_root="/tmp/odb-$over-$cpu-macosx" -# Using older version of GCC (newer one have trouble with old as). -# -export PATH=/$arch-4.5.1/bin:$PATH +export PATH=/$arch/bin:$PATH # Clean everything up if we are rebuilding. # @@ -95,7 +93,7 @@ if [ $rebuild = y ]; then ../libcutl-configure fi -make +make -j 4 cd .. # Build odb plugin @@ -106,7 +104,7 @@ if [ $rebuild = y ]; then ../odb-configure p $arch $install_root fi -make +make -j 2 make install-strip cd .. @@ -118,7 +116,7 @@ if [ $rebuild = y ]; then ../odb-configure d $arch $install_root fi -make -C odb odb +make -j 2 -C odb odb cp odb/odb $install_root/bin/ cd .. @@ -130,7 +128,7 @@ if [ $rebuild = y ]; then ../libodb-configure $install_root/lib/odb/$arch fi -make +make -j 4 cd odb make install-data cd ../.. @@ -143,7 +141,7 @@ if [ $rebuild = y ]; then ../libodb-boost-configure $install_root/lib/odb/$arch fi -make +make -j 4 make install-data cd .. @@ -155,7 +153,7 @@ if [ $rebuild = y ]; then ../libodb-qt-configure $install_root/lib/odb/$arch fi -make +make -j 4 make install-data cd .. -- cgit v1.1