Browse Source

Updating osmia

master
dirkson 3 years ago
parent
commit
42dee4dcd3
  1. 11
      build

11
build

@ -5,7 +5,6 @@
#************
#If CC isn't set, the script will attempt to figure it out itself.
#If you change the compiler, you'll need to clean your build.
#CC=musl-gcc
#If this isn't set, the script will attempt to find ninja and samu, in that order.
@ -106,8 +105,7 @@ if [ -e "$MDIR/osmia/clean" ]; then
rm $MDIR/osmia/clean
fi
#clear
clear
err=0;
@ -220,8 +218,9 @@ fi
#Check if our CC changed. If it did, clean
if [ -e "$MDIR/osmia/cc" ]; then
if [ "$CC" = $(cat $MDIR/osmia/cc) ]; then
echo "S"
if [ "$CC" != $(cat $MDIR/osmia/cc) ]; then
echo "osmia: compiler changed. Forced to clean."
osmia_clean
fi
fi
@ -236,6 +235,7 @@ fi
mkdir -p $MDIR/osmia/ 2> /dev/null
if [ ! -d "$MDIR/$DIR" ]; then
echo $CC > $MDIR/osmia/cc
export CC="$CACHE $CC"
#Run meson if required
mkdir $MDIR/$DIR
@ -247,7 +247,6 @@ if [ ! -d "$MDIR/$DIR" ]; then
echo "osmia: meson returned an error. Please check $MDIR/$DIR/meson-logs/meson-log.txt for more info."
exit 1
fi
echo $CC > $MDIR/osmia/cc
#else
#May wish to look into this in the future
#meson configure $MESONOPTS

Loading…
Cancel
Save