From 98e575877027ecdb36821d1da117306513c4977f Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Sun, 12 Jun 2016 20:10:57 -0400 Subject: [PATCH 1/2] linux-armv5: Add CircleCI testing --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index 715bc27..a65b56f 100644 --- a/circle.yml +++ b/circle.yml @@ -12,6 +12,7 @@ dependencies: - docker pull thewtex/cross-compiler-base - docker pull thewtex/cross-compiler-android-arm - docker pull thewtex/cross-compiler-browser-asmjs + - docker pull thewtex/cross-compiler-linux-armv5 - docker pull thewtex/cross-compiler-linux-armv6 - docker pull thewtex/cross-compiler-linux-armv7 - docker pull thewtex/cross-compiler-linux-ppc64le @@ -28,6 +29,8 @@ test: - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-android-arm python /usr/src/test/run.py - make browser-asmjs - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-browser-asmjs python /usr/src/test/run.py --emulator /usr/bin/node --exe-suffix ".js" + - make linux-armv5 + - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-armv5 python /usr/src/test/run.py --emulator /usr/bin/qemu-arm - make linux-armv6 - docker run --rm -v ~/cross-compilers/test/:/usr/src/test:ro thewtex/cross-compiler-linux-armv6 python /usr/src/test/run.py --emulator /usr/bin/qemu-arm - make linux-armv7 @@ -54,6 +57,7 @@ deployment: - docker push thewtex/cross-compiler-base - docker push thewtex/cross-compiler-android-arm - docker push thewtex/cross-compiler-browser-asmjs + - docker push thewtex/cross-compiler-linux-armv5 - docker push thewtex/cross-compiler-linux-armv6 - docker push thewtex/cross-compiler-linux-armv7 - docker push thewtex/cross-compiler-linux-ppc64le From 887717f375f85a8ab5d0f78fe016e48023f71800 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 4 Jul 2016 00:13:50 -0400 Subject: [PATCH 2/2] linux-armv5: Define CMAKE_TOOLCHAIN_FILE --- linux-armv5/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-armv5/Dockerfile b/linux-armv5/Dockerfile index 4d772f9..d6aad9a 100644 --- a/linux-armv5/Dockerfile +++ b/linux-armv5/Dockerfile @@ -27,3 +27,6 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \ ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/" + +COPY Toolchain.cmake ${CROSS_ROOT}/ +ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake