From 94156b631102e8a1086b3f8b693f2994932d4035 Mon Sep 17 00:00:00 2001
From: Anirudh Subramanian <anirudh2290@ufl.edu>
Date: Fri, 7 Jun 2019 03:40:29 +0000
Subject: [PATCH] Allow AR path to be chosen by user

---
 Makefile                       | 2 +-
 ci/docker/install/ubuntu_ar.sh | 2 +-
 ci/docker/runtime_functions.sh | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 6fc3c3aca5f6..11803e212d64 100644
--- 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
index e4677e675f02..e42e1f941410 100644
--- 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
index 1ad67280617d..7148770b342a 100755
--- 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)
 }