drop the target files

2016-10-06 23:20:09 -05:00 · 2016-10-06 23:20:09 -05:00 · 213d929f86
parent 6726a8c569
commit 213d929f86
9 changed files with 4 additions and 49 deletions
--- a/ci/docker/thumbv6m-none-eabi/Dockerfile
+++ b/ci/docker/thumbv6m-none-eabi/Dockerfile
@ -3,7 +3,7 @@ RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
    ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
 RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
-    bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.10
+    bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13
 ENV AR_thumbv6m_none_eabi=arm-none-eabi-ar \
    CARGO_TARGET_THUMBV6M_NONE_EABI_LINKER=arm-none-eabi-gcc \
    CC_thumbv6m_none_eabi=arm-none-eabi-gcc \
--- a/ci/docker/thumbv7em-none-eabi/Dockerfile
+++ b/ci/docker/thumbv7em-none-eabi/Dockerfile
@ -3,7 +3,7 @@ RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
    ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
 RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
-    bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.10
+    bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13
 ENV AR_thumbv7em_none_eabi=arm-none-eabi-ar \
    CARGO_TARGET_THUMBV7EM_NONE_EABI_LINKER=arm-none-eabi-gcc \
    CC_thumbv7em_none_eabi=arm-none-eabi-gcc \
--- a/ci/docker/thumbv7em-none-eabihf/Dockerfile
+++ b/ci/docker/thumbv7em-none-eabihf/Dockerfile
@ -3,7 +3,7 @@ RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
    ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
 RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
-    bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.10
+    bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13
 ENV AR_thumbv7em_none_eabihf=arm-none-eabi-ar \
    CARGO_TARGET_THUMBV7EM_NONE_EABIHF_LINKER=arm-none-eabi-gcc \
    CC_thumbv7em_none_eabihf=arm-none-eabi-gcc \
--- a/ci/docker/thumbv7m-none-eabi/Dockerfile
+++ b/ci/docker/thumbv7m-none-eabi/Dockerfile
@ -3,7 +3,7 @@ RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
    ca-certificates curl gcc gcc-arm-none-eabi libc6-dev libcurl4-openssl-dev libssh2-1 libnewlib-dev
 RUN curl -sf "https://raw.githubusercontent.com/japaric/rust-everywhere/master/install.sh" | \
-    bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.10
+    bash -s -- --at /usr/bin --from japaric/xargo --for x86_64-unknown-linux-gnu --tag v0.1.13
 ENV AR_thumbv7m_none_eabi=arm-none-eabi-ar \
    CARGO_TARGET_THUMBV7M_NONE_EABI_LINKER=arm-none-eabi-gcc \
    CC_thumbv7m_none_eabi=arm-none-eabi-gcc \
--- a/ci/run.sh
+++ b/ci/run.sh
@ -3,8 +3,6 @@ set -e
 # Test our implementation
 case $1 in
    thumb*)
-        export RUST_TARGET_PATH=/checkout/targets
-
        xargo build --target $1
        xargo build --target $1 --release
        ;;
--- a/targets/thumbv6m-none-eabi.json
+++ b/targets/thumbv6m-none-eabi.json
@ -1,12 +0,0 @@
-{
-    "arch": "arm",
-    "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
-    "executables": true,
-    "features": "+strict-align",
-    "llvm-target": "thumbv6m-none-eabi",
-    "max-atomic-width": 0,
-    "os": "none",
-    "pre-link-args": ["-nostartfiles"],
-    "target-endian": "little",
-    "target-pointer-width": "32"
-}
--- a/targets/thumbv7em-none-eabi.json
+++ b/targets/thumbv7em-none-eabi.json
@ -1,10 +0,0 @@
-{
-    "arch": "arm",
-    "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
-    "executables": true,
-    "llvm-target": "thumbv7em-none-eabi",
-    "os": "none",
-    "pre-link-args": ["-nostartfiles"],
-    "target-endian": "little",
-    "target-pointer-width": "32"
-}
--- a/targets/thumbv7em-none-eabihf.json
+++ b/targets/thumbv7em-none-eabihf.json
@ -1,11 +0,0 @@
-{
-    "arch": "arm",
-    "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
-    "executables": true,
-    "features": "+vfp4",
-    "llvm-target": "thumbv7em-none-eabihf",
-    "os": "none",
-    "pre-link-args": ["-nostartfiles"],
-    "target-endian": "little",
-    "target-pointer-width": "32"
-}
--- a/targets/thumbv7m-none-eabi.json
+++ b/targets/thumbv7m-none-eabi.json
@ -1,10 +0,0 @@
-{
-    "arch": "arm",
-    "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
-    "executables": true,
-    "llvm-target": "thumbv7m-none-eabi",
-    "os": "none",
-    "pre-link-args": ["-nostartfiles"],
-    "target-endian": "little",
-    "target-pointer-width": "32"
-}