From 0827f8c7f131c95ae9747c0639c1b89070f6c94a Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 2 Oct 2016 19:05:01 -0500 Subject: [PATCH] hide the thumbv* target files due to how Cargo works, the rustc-cfg in build.rs was picking our target specifications rather than the one the user meant to use. Placing our target files in any place other than the root of the Cargo project avoids the issue. --- ci/run.sh | 2 ++ thumbv6m-none-eabi.json => targets/thumbv6m-none-eabi.json | 0 thumbv7em-none-eabi.json => targets/thumbv7em-none-eabi.json | 0 .../thumbv7em-none-eabihf.json | 0 thumbv7m-none-eabi.json => targets/thumbv7m-none-eabi.json | 0 5 files changed, 2 insertions(+) rename thumbv6m-none-eabi.json => targets/thumbv6m-none-eabi.json (100%) rename thumbv7em-none-eabi.json => targets/thumbv7em-none-eabi.json (100%) rename thumbv7em-none-eabihf.json => targets/thumbv7em-none-eabihf.json (100%) rename thumbv7m-none-eabi.json => targets/thumbv7m-none-eabi.json (100%) diff --git a/ci/run.sh b/ci/run.sh index eae37de..e938bc1 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -3,6 +3,8 @@ set -e # Test our implementation case $1 in thumb*) + export RUST_TARGET_PATH=/checkout/targets + xargo build --target $1 xargo build --target $1 --release ;; diff --git a/thumbv6m-none-eabi.json b/targets/thumbv6m-none-eabi.json similarity index 100% rename from thumbv6m-none-eabi.json rename to targets/thumbv6m-none-eabi.json diff --git a/thumbv7em-none-eabi.json b/targets/thumbv7em-none-eabi.json similarity index 100% rename from thumbv7em-none-eabi.json rename to targets/thumbv7em-none-eabi.json diff --git a/thumbv7em-none-eabihf.json b/targets/thumbv7em-none-eabihf.json similarity index 100% rename from thumbv7em-none-eabihf.json rename to targets/thumbv7em-none-eabihf.json diff --git a/thumbv7m-none-eabi.json b/targets/thumbv7m-none-eabi.json similarity index 100% rename from thumbv7m-none-eabi.json rename to targets/thumbv7m-none-eabi.json