summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2018-10-09 08:32:55 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2018-10-09 08:32:55 +0200
commitb2d53d7379fc1f38523af6a3a448943e73ab1d96 (patch)
treecb204fd0dffb2b91ceb6053d4a9b38cce96a9435
parent78210acd53ac3bcb220461da5f4b1eab3757baf3 (diff)
build-fcts : fix meson build
-rwxr-xr-xbuild-fcts.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/build-fcts.sh b/build-fcts.sh
index 1b71d6b..a725e20 100755
--- a/build-fcts.sh
+++ b/build-fcts.sh
@@ -223,13 +223,11 @@ 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} $BUILD_DIR" || fatal "meson" 226 exec_cmd "meson --prefix=${PREFIX} $1 $BUILD_DIR" || fatal "meson"
227 exec_cmd "meson configure $1 $BUILD_DIR" || fatal "meson configure"
228 else 227 else
229 [ $CLEAN_LEVEL -ge 3 ] && ( exec_cmd "meson configure --clearcache $BUILD_DIR" || fatal "meson configure" ) 228 [ $CLEAN_LEVEL -ge 3 ] && ( exec_cmd "meson configure --clearcache $BUILD_DIR" || fatal "meson configure" )
230 fi 229 fi
231 echo "$SUDO_PASSWD" | sudo -S chown $USER $BUILD_DIR/.ninja_deps $BUILD_DIR/.ninja_log || true 230 [ $CLEAN_LEVEL -ge 1 -a $CLEAN_LEVEL -lt 4 -a -f $BUILD_DIR/build.ninja ] && exec_cmd "ninja -C $BUILD_DIR clean"
232 [ $CLEAN_LEVEL -ge 1 -a -f $BUILD_DIR/build.ninja ] && exec_cmd "ninja -C $BUILD_DIR clean"
233 echo -e " $RED:: build $RESET" 231 echo -e " $RED:: build $RESET"
234 exec_cmd "ninja -C $BUILD_DIR" || fatal "ninja" 232 exec_cmd "ninja -C $BUILD_DIR" || fatal "ninja"
235 echo -e " $RED:: install $RESET" 233 echo -e " $RED:: install $RESET"