diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-cross.sh | 2 | ||||
| -rw-r--r-- | scripts/build.sh | 8 | ||||
| -rw-r--r-- | scripts/rebuild.sh | 8 |
3 files changed, 15 insertions, 3 deletions
diff --git a/scripts/build-cross.sh b/scripts/build-cross.sh index 4632f4fd..efae547e 100755 --- a/scripts/build-cross.sh +++ b/scripts/build-cross.sh @@ -2,7 +2,7 @@ # # sudo mkdir -p /mnt/arm64 -# sudo mount /data/diskimages/RaspiArm64LightDev-1.2-rw-deb11-arm64-litexdev.root-ext4.img /mnt/arm64 +# sudo mount /data/diskimages/RaspiArm64LightDev-1.3-rw-deb11-arm64-litexdev.root-ext4.img /mnt/arm64 # scripts/build-cross.sh /mnt/arm64 # # sudo mkdir -p /mnt/arm32 diff --git a/scripts/build.sh b/scripts/build.sh index 856273d8..6ed0f8bf 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -17,6 +17,12 @@ export LC_MEASUREMENT=en_US.UTF-8 export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 +if ! type time &> /dev/null ; then + time_cmd="" +else + time_cmd="time" +fi + buildit() { if [ -z "$JAVA_HOME" -o ! -e "$JAVA_HOME" ] ; then echo "WARNING: JAVA_HOME $JAVA_HOME does not exist" @@ -55,7 +61,7 @@ buildit() { # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/$dist_dir -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TRIAL=ON -DDEBUG=ON -DINSTRUMENTATION=ON .. # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/$dist_dir -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TRIAL=ON -DDEBUG=ON -DINSTRUMENTATION_UNDEFINED=ON .. # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/$dist_dir -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TRIAL=ON -DDEBUG=ON -DINSTRUMENTATION_THREAD=ON .. - time make -j $CPU_COUNT install + ${time_cmd} make -j $CPU_COUNT install if [ $? -eq 0 ] ; then echo "BUILD SUCCESS $bname $os_name $archabi" cd $rootdir diff --git a/scripts/rebuild.sh b/scripts/rebuild.sh index 91ed854b..fd5d6c00 100644 --- a/scripts/rebuild.sh +++ b/scripts/rebuild.sh @@ -15,6 +15,12 @@ CPU_COUNT=`getconf _NPROCESSORS_ONLN` export LANG=en_US.UTF-8 export LC_MEASUREMENT=en_US.UTF-8 +if ! type time &> /dev/null ; then + time_cmd="" +else + time_cmd="time" +fi + buildit() { if [ -z "$JAVA_HOME" -o ! -e "$JAVA_HOME" ] ; then echo "WARNING: JAVA_HOME $JAVA_HOME does not exist" @@ -31,7 +37,7 @@ buildit() { echo build_dir $build_dir cd $rootdir/$build_dir - make -j $CPU_COUNT install + ${time_cmd} make -j $CPU_COUNT install if [ $? -eq 0 ] ; then echo "REBUILD SUCCESS $bname $os_name $archabi" cd $rootdir |