Disable libstd and libtest dylib

Author: antoyo

.github/workflows/m68k.yml

@@ -67,14 +67,6 @@ jobs:
     - name: Setup path to libgccjit
       run: |
           sudo dpkg -i gcc-m68k-13.deb
-          echo "*********************"
-          ls /usr/bin
-          echo "*********************"
-          ls /bin
-          echo "*********************"
-          ls /lib
-          echo "*********************"
-          ls /usr/lib
           echo /usr/lib/ > gcc_path
 
     - name: Set env
@@ -119,7 +111,6 @@ jobs:
         #path: rust
         #key: ${{ runner.os }}-packages-${{ hashFiles('rust/.git/HEAD') }}
 
-    # TODO: reset cross-gcc config file (i.e. try to revert CT_BINUTILS_V_2_37 to CT_BINUTILS_V_2_38).
     - name: Test build (TODO REMOVE)
       run: |
         cat > main.c <<EOF
@@ -148,6 +139,10 @@ jobs:
     - name: Build
       run: |
         ./y.sh prepare --only-libcore
+        # TODO: move into prepare command under a flag --cross-patches?
+        pushd build_sysroot/sysroot_src
+        git am ../../cross_patches/*.patch
+        popd
         ./build.sh
         cargo test
         ./clean_all.sh

build_sysroot/build_sysroot.sh

@@ -22,7 +22,8 @@ if [[ "$1" == "--release" ]]; then
     RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=3" cargo build --target $TARGET_TRIPLE --release
 else
     sysroot_channel='debug'
-    cargo build --target $TARGET_TRIPLE --features compiler_builtins/c
+    # TODO: add flags to simplify the case for cross-compilation.
+    AR="m68k-unknown-linux-gnu-ar" CC="m68k-unknown-linux-gnu-gcc" cargo build --target $TARGET_TRIPLE --features compiler_builtins/c
 fi
 
 # Copy files to sysroot

config.sh

@@ -28,6 +28,7 @@ RUN_WRAPPER=''
 if [[ "$HOST_TRIPLE" != "$TARGET_TRIPLE" ]]; then
    if [[ "$TARGET_TRIPLE" == "m68k-unknown-linux-gnu" ]]; then
        #TARGET_TRIPLE="mips-unknown-linux-gnu"
+       # TODO: figure a better way for the user to do that automatically for any target.
        linker='-Clinker=m68k-unknown-linux-gnu-gcc'
    elif [[ "$TARGET_TRIPLE" == "aarch64-unknown-linux-gnu" ]]; then
       # We are cross-compiling for aarch64. Use the correct linker and run tests in qemu.
@@ -61,4 +62,4 @@ export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 # To do so, add a symlink for cc to /opt/gcc/bin/gcc in our PATH.
 # Another option would be to add the following Rust flag: -Clinker=/opt/gcc/bin/gcc
 export PATH="/opt/m68k-unknown-linux-gnu/bin:$PATH"
-export TARGET=$TARGET_TRIPLE
+#export TARGET=$TARGET_TRIPLE

cross_patches/0001-Disable-libstd-and-libtest-dylib.patch

@@ -0,0 +1,39 @@
+From 966beefe08be6045bfcca26079b76a7a80413080 Mon Sep 17 00:00:00 2001
+From: None <[email protected]>
+Date: Thu, 28 Sep 2023 17:37:38 -0400
+Subject: [PATCH] Disable libstd and libtest dylib
+
+---
+ library/std/Cargo.toml  | 2 +-
+ library/test/Cargo.toml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
+index 5b21355..cb0c49b 100644
+--- a/library/std/Cargo.toml
++++ b/library/std/Cargo.toml
+@@ -9,7 +9,7 @@ description = "The Rust Standard Library"
+ edition = "2021"
+ 
+ [lib]
+-crate-type = ["dylib", "rlib"]
++crate-type = ["rlib"]
+ 
+ [dependencies]
+ alloc = { path = "../alloc", public = true }
+diff --git a/library/test/Cargo.toml b/library/test/Cargo.toml
+index 91a1abd..a58c160 100644
+--- a/library/test/Cargo.toml
++++ b/library/test/Cargo.toml
+@@ -4,7 +4,7 @@ version = "0.0.0"
+ edition = "2021"
+ 
+ [lib]
+-crate-type = ["dylib", "rlib"]
++crate-type = ["rlib"]
+ 
+ [dependencies]
+ getopts = { version = "0.2.21", features = ['rustc-dep-of-std'] }
+-- 
+2.42.0
+

tests/lang_tests_common.rs

@@ -50,6 +50,14 @@ pub fn main_inner(profile: Profile) {
                 "-o", exe.to_str().expect("to_str"),
                 path.to_str().expect("to_str"),
             ]);
+
+            // TODO: allow setting this with a CLI arg (or environment variable if not possible).
+            compiler.args(&["--target", "m68k-unknown-linux-gnu"]);
+            compiler.args(&["-Clinker=m68k-unknown-linux-gnu-gcc"]);
+            let mut env_path = std::env::var("PATH").unwrap_or_default();
+            env_path = format!("/opt/m68k-unknown-linux-gnu/bin:{}", env_path);
+            compiler.env("PATH", env_path);
+
             if let Some(flags) = option_env!("TEST_FLAGS") {
                 for flag in flags.split_whitespace() {
                     compiler.arg(&flag);
@@ -65,7 +73,21 @@ pub fn main_inner(profile: Profile) {
                 }
             }
             // Test command 2: run `tempdir/x`.
-            let runtime = Command::new(exe);
+            let vm_parent_dir = "..";
+            let vm_dir = "vm";
+            let exe_filename = exe.file_name().unwrap();
+            let vm_exe_path = PathBuf::from(vm_parent_dir).join(vm_dir).join("home").join(exe_filename);
+            // FIXME: panicking here makes the test pass.
+            let inside_vm_exe_path = PathBuf::from("/home").join(&exe_filename);
+            let mut copy = Command::new("sudo");
+            copy.arg("cp");
+            copy.args(&[&exe, &vm_exe_path]);
+            copy.status().expect("copy executable inside VM");
+
+            let mut runtime = Command::new("sudo");
+            runtime.args(&["chroot", vm_dir, "qemu-m68k-static"]);
+            runtime.arg(inside_vm_exe_path);
+            runtime.current_dir(vm_parent_dir);
             vec![("Compiler", compiler), ("Run-time", runtime)]
         })
         .run();

tests/run/empty_main.rs

@@ -35,6 +35,6 @@ pub(crate) unsafe auto trait Freeze {}
  */
 
 #[start]
-fn main(mut argc: isize, _argv: *const *const u8) -> isize {
+fn main(_argc: isize, _argv: *const *const u8) -> isize {
     0
 }