diff options
| -rwxr-xr-x | dist.sh | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -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 |