create symlink for ninja

apache · Jul 3, 2021 · a81fb74 · a81fb74
1 parent c711966
commit a81fb74
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -2011,6 +2011,9 @@ build_static_libmxnet() {
     set -ex
     pushd .
     local mxnet_variant=${1:?"This function requires a python command as the first argument"}
+    if [[ ${mxnet_variant} = aarch64_cpu ]]; then
+        source /opt/rh/devtoolset-10/enable
+    fi
     CMAKE_STATICBUILD=1
     source tools/staticbuild/build.sh ${mxnet_variant}
     popd

diff --git a/tools/staticbuild/build.sh b/tools/staticbuild/build.sh
@@ -50,7 +50,6 @@ fi
 export MAKE="make $ADD_MAKE_FLAG"
 
 if [[ $ARCH == 'aarch64' ]]; then
-    source /opt/rh/devtoolset-10/enable
     export CC="gcc -fPIC -moutline-atomics"
     export CXX="g++ -fPIC -moutline-atomics"
     export PKG_CONFIG_PATH=$DEPS_PATH/lib/pkgconfig:$DEPS_PATH/lib64/pkgconfig:$DEPS_PATH/lib/aarch64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH

diff --git a/tools/staticbuild/build_lib_cmake.sh b/tools/staticbuild/build_lib_cmake.sh
@@ -32,7 +32,11 @@ git submodule update --init --recursive || true
 # Build libmxnet.so
 rm -rf build; mkdir build; cd build
 cmake -GNinja -C $cmake_config -DCMAKE_PREFIX_PATH=${DEPS_PATH} -DCMAKE_FIND_ROOT_PATH=${DEPS_PATH} ..
-ninja-build
+if [[ ! $ARCH == 'aarch64' ]]; then
+    ninja
+else
+    ninja-build
+fi
 cd -
 
 # Move to lib