From 033943360ac4a19fed320a4f1cc7cc941730019f Mon Sep 17 00:00:00 2001
From: Aran Khanna <arankhanna@college.harvard.edu>
Date: Fri, 24 Mar 2017 17:04:08 -0700
Subject: [PATCH] added crosstool changes (#5564)

---
 tests/ci_build/Dockerfile.crosstool           | 23 +++++++++++++++++
 .../ci_build/Dockerfile.ubuntu1404_crosstool  | 25 -------------------
 2 files changed, 23 insertions(+), 25 deletions(-)
 create mode 100644 tests/ci_build/Dockerfile.crosstool
 delete mode 100644 tests/ci_build/Dockerfile.ubuntu1404_crosstool

diff --git a/tests/ci_build/Dockerfile.crosstool b/tests/ci_build/Dockerfile.crosstool
new file mode 100644
index 000000000000..371cdc730bb8
--- /dev/null
+++ b/tests/ci_build/Dockerfile.crosstool
@@ -0,0 +1,23 @@
+FROM ubuntu
+MAINTAINER Aran Khanna <arankhan@amazon.com>
+
+# UPDATE BOX
+RUN apt-get update && apt-get -y upgrade
+
+# TOOLCHAIN DEPS
+RUN apt-get install -y python python-setuptools python-pip python-dev unzip gfortran
+RUN apt-get install -y git bison cvs flex gperf texinfo automake libtool help2man make libtool-bin libncurses5-dev g++ cmake wget gawk
+RUN pip install numpy nose
+
+# BUILD TOOLCHAIN
+RUN git clone https://github.com/arank/crosstool-NG
+RUN cd crosstool-NG && ./bootstrap && ./configure && make && make install
+
+RUN useradd -ms /bin/bash aran
+RUN cd && cp -R .profile .bashrc /home/aran
+ADD . /home/aran/build
+
+RUN chown -R aran:aran /home/aran
+
+RUN cd /home/aran/build && su -m aran -c "export HOME=/home/aran;ct-ng arm-unknown-linux-gnueabi;ct-ng build"
+
diff --git a/tests/ci_build/Dockerfile.ubuntu1404_crosstool b/tests/ci_build/Dockerfile.ubuntu1404_crosstool
deleted file mode 100644
index 99f99c56be0b..000000000000
--- a/tests/ci_build/Dockerfile.ubuntu1404_crosstool
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM nvidia/cuda:7.5-cudnn5-devel
-MAINTAINER Aran Khanna <arankhan@amazon.com>
-
-# PYTHON2
-RUN apt-get install -y python python-setuptools python-pip python-dev unzip gfortran
-RUN pip install numpy nose scipy
-
-# TESTDEPS
-RUN apt-get install -y libgtest-dev cmake wget
-RUN cd /usr/src/gtest && cmake CMakeLists.txt && make && cp *.a /usr/lib
-RUN pip install nose cpplint 'pylint==1.4.4' 'astroid==1.3.6'
-
-# TOOLCHAIN DEPS
-RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y install git bison cvs flex gperf texinfo automake libtool help2man make libtool-bin libncurses5-dev g++
-
-# BUILD TOOLCHAIN
-RUN git clone https://github.com/arank/crosstool-NG
-RUN cd crosstool-NG
-RUN make
-RUN make install
-RUN mkdir ../build
-RUN cd ../build
-RUN ct-ng arm-unknown-linux-gnueabi
-RUN ct-ng build