move all buildrs to new build crate

tock · Aug 4, 2023 · 026e8db · 026e8db
1 parent 224097b
commit 026e8db
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 0 deletions.
diff --git a/runtime/build.rs → libtock_runtime_build/build.rs b/runtime/build.rs → libtock_runtime_build/build.rs
@@ -18,6 +18,10 @@ fn main() {
  "Build path contains a newline, which is unsupported"
  );
 
+ // Share the out dir of this crate with the actual source so we know where
+ // we put the linker scripts.
+ println!("cargo:rustc-env=LIBTOCK_RUNTIME_BUILD_OUT_DIR={}", out_dir);
+
  // Copy all platform linker scripts to a directory where the linker can find
  // them.
  let paths = read_dir("layouts").unwrap();

diff --git a/runtime/layouts/apollo3.ld → libtock_runtime_build/layouts/apollo3.ld b/runtime/layouts/apollo3.ld → libtock_runtime_build/layouts/apollo3.ld
diff --git a/runtime/layouts/clue_nrf52840.ld → ...ck_runtime_build/layouts/clue_nrf52840.ld b/runtime/layouts/clue_nrf52840.ld → ...ck_runtime_build/layouts/clue_nrf52840.ld
diff --git a/runtime/layouts/esp32_c3_devkitm_1.ld → ...ntime_build/layouts/esp32_c3_devkitm_1.ld b/runtime/layouts/esp32_c3_devkitm_1.ld → ...ntime_build/layouts/esp32_c3_devkitm_1.ld
diff --git a/runtime/layouts/hail.ld → libtock_runtime_build/layouts/hail.ld b/runtime/layouts/hail.ld → libtock_runtime_build/layouts/hail.ld
diff --git a/runtime/layouts/hifive1.ld → libtock_runtime_build/layouts/hifive1.ld b/runtime/layouts/hifive1.ld → libtock_runtime_build/layouts/hifive1.ld
diff --git a/runtime/layouts/imix.ld → libtock_runtime_build/layouts/imix.ld b/runtime/layouts/imix.ld → libtock_runtime_build/layouts/imix.ld
diff --git a/runtime/layouts/imxrt1050.ld → libtock_runtime_build/layouts/imxrt1050.ld b/runtime/layouts/imxrt1050.ld → libtock_runtime_build/layouts/imxrt1050.ld
diff --git a/runtime/layouts/microbit_v2.ld → libtock_runtime_build/layouts/microbit_v2.ld b/runtime/layouts/microbit_v2.ld → libtock_runtime_build/layouts/microbit_v2.ld
diff --git a/runtime/layouts/msp432.ld → libtock_runtime_build/layouts/msp432.ld b/runtime/layouts/msp432.ld → libtock_runtime_build/layouts/msp432.ld
diff --git a/runtime/layouts/nano_rp2040_connect.ld → ...time_build/layouts/nano_rp2040_connect.ld b/runtime/layouts/nano_rp2040_connect.ld → ...time_build/layouts/nano_rp2040_connect.ld
diff --git a/runtime/layouts/nrf52.ld → libtock_runtime_build/layouts/nrf52.ld b/runtime/layouts/nrf52.ld → libtock_runtime_build/layouts/nrf52.ld
diff --git a/runtime/layouts/nrf52840.ld → libtock_runtime_build/layouts/nrf52840.ld b/runtime/layouts/nrf52840.ld → libtock_runtime_build/layouts/nrf52840.ld
diff --git a/runtime/layouts/nucleo_f429zi.ld → ...ck_runtime_build/layouts/nucleo_f429zi.ld b/runtime/layouts/nucleo_f429zi.ld → ...ck_runtime_build/layouts/nucleo_f429zi.ld
diff --git a/runtime/layouts/nucleo_f446re.ld → ...ck_runtime_build/layouts/nucleo_f446re.ld b/runtime/layouts/nucleo_f446re.ld → ...ck_runtime_build/layouts/nucleo_f446re.ld
diff --git a/runtime/layouts/opentitan.ld → libtock_runtime_build/layouts/opentitan.ld b/runtime/layouts/opentitan.ld → libtock_runtime_build/layouts/opentitan.ld
diff --git a/runtime/layouts/raspberry_pi_pico.ld → ...untime_build/layouts/raspberry_pi_pico.ld b/runtime/layouts/raspberry_pi_pico.ld → ...untime_build/layouts/raspberry_pi_pico.ld
diff --git a/runtime/layouts/stm32f3discovery.ld → ...runtime_build/layouts/stm32f3discovery.ld b/runtime/layouts/stm32f3discovery.ld → ...runtime_build/layouts/stm32f3discovery.ld
diff --git a/runtime/layouts/stm32f412gdiscovery.ld → ...time_build/layouts/stm32f412gdiscovery.ld b/runtime/layouts/stm32f412gdiscovery.ld → ...time_build/layouts/stm32f412gdiscovery.ld
diff --git a/runtime/libtock_layout.ld → libtock_runtime_build/libtock_layout.ld b/runtime/libtock_layout.ld → libtock_runtime_build/libtock_layout.ld
diff --git a/libtock_runtime_build/src/lib.rs b/libtock_runtime_build/src/lib.rs
@@ -27,6 +27,11 @@ pub fn auto_layout() {
  "Build path contains a newline, which is unsupported"
  );
 
+ // Set the linker search path to the out dir of this crate where we have
+ // stored all of the linker files.
+ let runtime_build_out_dir = env!("LIBTOCK_RUNTIME_BUILD_OUT_DIR");
+ println!("cargo:rustc-link-search={}", runtime_build_out_dir);
+
  // Choose the linker file we are going to use for this build. That can be
  // specified by choosing a platform, where the linker file will be selected
  // from `runtime/layouts`, or by explicitly setting the flash and RAM