summaryrefslogtreecommitdiff
path: root/binary/darwin
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-10-24 08:51:28 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-10-24 08:51:28 +0200
commit4923b1b703b30866d5b49d987303f98af0182ec4 (patch)
treefdacfa46bf9a0b4fc37125a005840bd941e3eb43 /binary/darwin
parentbedbd132d570b1c3fd8b49e1b4b51d0465b75e1f (diff)
Update for new release2.3.02.3
Diffstat (limited to 'binary/darwin')
-rwxr-xr-xbinary/darwin/libcutl-configure2
-rw-r--r--binary/darwin/test/gcc6
-rw-r--r--binary/darwin/test/gcc-qt6
3 files changed, 8 insertions, 6 deletions
diff --git a/binary/darwin/libcutl-configure b/binary/darwin/libcutl-configure
index daab3ad..621d50b 100755
--- a/binary/darwin/libcutl-configure
+++ b/binary/darwin/libcutl-configure
@@ -7,6 +7,8 @@ libgcc_eh=`g++ --print-file-name libgcc_eh.a`
./configure \
--disable-shared \
--with-pic \
+CC="gcc -nodefaultlibs" \
+CFLAGS=-O2 \
CXX="g++ -nodefaultlibs" \
CXXFLAGS=-O2 \
LIBS="$libcxx $libgcc $libgcc_eh -lSystem"
diff --git a/binary/darwin/test/gcc b/binary/darwin/test/gcc
index 7ac3eb5..db3848d 100644
--- a/binary/darwin/test/gcc
+++ b/binary/darwin/test/gcc
@@ -8,13 +8,13 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql"
+mysql_use_options="--with-mysql-host=192.168.0.2 --with-mysql-client=$MYSQL/bin/mysql"
pgsql_build_options=
-pgsql_use_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql"
+pgsql_use_options="--with-pgsql-host=192.168.0.2 --with-pgsql-client=$PGSQL/bin/psql"
oracle_build_options="--with-oci=$ORACLE"
-oracle_use_options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
+oracle_use_options="--with-oracle-host=192.168.0.2 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
# @@ While we have Qt installed (as a framework), we don't have a g++ build
# that is both recent enough (so it can handle friend access) and that supports
diff --git a/binary/darwin/test/gcc-qt b/binary/darwin/test/gcc-qt
index c17bdd0..b555209 100644
--- a/binary/darwin/test/gcc-qt
+++ b/binary/darwin/test/gcc-qt
@@ -8,13 +8,13 @@ sqlite_build_options=
sqlite_use_options=
mysql_build_options=
-mysql_use_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql"
+mysql_use_options="--with-mysql-host=192.168.0.2 --with-mysql-client=$MYSQL/bin/mysql"
pgsql_build_options=
-pgsql_use_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql"
+pgsql_use_options="--with-pgsql-host=192.168.0.2 --with-pgsql-client=$PGSQL/bin/psql"
oracle_build_options="--with-oci=$ORACLE"
-oracle_use_options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
+oracle_use_options="--with-oracle-host=192.168.0.2 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus"
with_qt=y
with_boost=y