summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2018-10-03 11:34:01 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2018-10-03 11:34:01 +0200
commit78210acd53ac3bcb220461da5f4b1eab3757baf3 (patch)
treefb55f7f0cf613f13f8c0bc22ad5d027d4bf52347
parentbf09d92119e78dc723e280e58f82fb2bc9a59878 (diff)
fix meson build options
-rwxr-xr-xbuild-fcts.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/build-fcts.sh b/build-fcts.sh
index b1df691..1b71d6b 100755
--- a/build-fcts.sh
+++ b/build-fcts.sh
@@ -158,10 +158,10 @@ function build()
158 158
159 if [ $do_build -gt 0 -a $use_make -eq 1 ] 159 if [ $do_build -gt 0 -a $use_make -eq 1 ]
160 then 160 then
161 do_make $2 161 do_make "$2"
162 elif [ $do_build -gt 0 -a $use_meson -eq 1 -a -f "meson.build" ] 162 elif [ $do_build -gt 0 -a $use_meson -eq 1 -a -f "meson.build" ]
163 then 163 then
164 do_meson $2 164 do_meson "$2"
165 elif [ $do_build -gt 0 ] 165 elif [ $do_build -gt 0 ]
166 then 166 then
167 local configure="./configure" 167 local configure="./configure"
@@ -223,8 +223,8 @@ function do_meson()
223 [ $CLEAN_LEVEL -ge 4 -a -d $BUILD_DIR ] && exec_cmd "rm -fr $BUILD_DIR" 2>/dev/null 223 [ $CLEAN_LEVEL -ge 4 -a -d $BUILD_DIR ] && exec_cmd "rm -fr $BUILD_DIR" 2>/dev/null
224 if [ ! -f "$mesontoken" ] 224 if [ ! -f "$mesontoken" ]
225 then 225 then
226 exec_cmd "meson --prefix=${PREFIX} $1 $BUILD_DIR" || fatal "meson" 226 exec_cmd "meson --prefix=${PREFIX} $BUILD_DIR" || fatal "meson"
227 exec_cmd "meson configure $BUILD_DIR" || fatal "meson configure" 227 exec_cmd "meson configure $1 $BUILD_DIR" || fatal "meson configure"
228 else 228 else
229 [ $CLEAN_LEVEL -ge 3 ] && ( exec_cmd "meson configure --clearcache $BUILD_DIR" || fatal "meson configure" ) 229 [ $CLEAN_LEVEL -ge 3 ] && ( exec_cmd "meson configure --clearcache $BUILD_DIR" || fatal "meson configure" )
230 fi 230 fi