summaryrefslogtreecommitdiff
path: root/dist.sh
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-04-29 15:26:10 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-04-29 15:26:10 +0200
commitb46fed7effbff7cda89c583d604f2c17943525aa (patch)
treea5cd9c6dbc036ccadcfbee029160b3c1c76b3505 /dist.sh
parent908cb21c78bc5911f37390e9a18a550b0cf216b0 (diff)
Add support for passing C++ compiler options to dist.sh
Diffstat (limited to 'dist.sh')
-rwxr-xr-xdist.sh18
1 files changed, 16 insertions, 2 deletions
diff --git a/dist.sh b/dist.sh
index cd46476..89fbedf 100755
--- a/dist.sh
+++ b/dist.sh
@@ -9,8 +9,10 @@
# -odb <odb-compiler-path>
# -cc <c-compiler>
# -cxx <c++-compiler>
+# -cxxflags <c++-compiler-flags>
# -ccp <gcc-plugin-compiler>
# -cxxp <g++-plugin-compiler>
+# -cxxpflags <g++-plugin-compiler-flags>
# -<db>-options <options>
# -<db>-test-options <options>
#
@@ -52,6 +54,7 @@ cxx=g++
ccp=gcc-4.5
cxxp=g++-4.5
cxxflags="-W -Wall -Wno-unknown-pragmas -O3"
+cxxpflags="-W -Wall -O3"
mysql_options=
mysql_test_options=
@@ -99,6 +102,11 @@ while [ $# -gt 0 ]; do
cxx=$1
shift
;;
+ -cxxflags)
+ shift
+ cxxflags=$1
+ shift
+ ;;
-ccp)
shift
ccp=$1
@@ -109,6 +117,11 @@ while [ $# -gt 0 ]; do
cxxp=$1
shift
;;
+ -cxxpflags)
+ shift
+ cxxpflags=$1
+ shift
+ ;;
-mysql-options)
shift
mysql_options=$1
@@ -214,7 +227,8 @@ mkdir -p $out_root/pack
#
if [ $complete = y ]; then
cd $src_root/../cutl
- ./dist.sh -cc "$ccp" -cxx "$cxxp" -out "$out_root/libcutl"
+ ./dist.sh -cc "$ccp" -cxx "$cxxp" -cxxflags "$cxxpflags" \
+-out "$out_root/libcutl"
cd $wd
fi
@@ -228,7 +242,7 @@ dist dist_prefix=$out_root/odb
./bootstrap
./configure --with-libcutl=../libcutl CC="$ccp" CXX="$cxxp" \
-CXXFLAGS="$cxxflags"
+CXXFLAGS="$cxxpflags"
make -j 8
make dist