Allow AR path to be chosen by user

apache · Jun 7, 2019 · 94156b6 · 94156b6
1 parent ea7dd32
commit 94156b6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -543,7 +543,7 @@ endif
 # --Wl,--whole-archive -lmxnet --Wl,--no-whole-archive
 lib/libmxnet.a: $(ALLX_DEP)
 	@mkdir -p $(@D)
-	ar crv $@ $(filter %.o, $?)
+	$(AR) crv $@ $(filter %.o, $?)
 
 lib/libmxnet.so: $(ALLX_DEP)
 	@mkdir -p $(@D)

diff --git a/ci/docker/install/ubuntu_ar.sh b/ci/docker/install/ubuntu_ar.sh
@@ -27,7 +27,7 @@ apt-get update || true
 apt-get install -y \
     wget
 
-mkdir /opt/binutils_install && mkdir /opt/binutils_install && mkdir /opt/binutils && cd /opt/binutils
+mkdir /opt/binutils_install && mkdir /opt/binutils_other && mkdir /opt/binutils && cd /opt/binutils
 wget -nv https://mirror.clarkson.edu/gnu/binutils/binutils-2.27.tar.gz
 ./configure --prefix=/opt/binutils_install --exec-prefix=/opt/binutils_other
 make -j$(nproc)

diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -667,6 +667,7 @@ build_ubuntu_gpu_mkldnn() {
         USE_CUDNN=1                               \
         CUDA_ARCH="$CI_CUDA_COMPUTE_CAPABILITIES" \
         USE_SIGNAL_HANDLER=1                      \
+        AR=/usr/local/bin/ar                      \
         -j$(nproc)
 }