diff --git a/.github/workflows/basic_cli_build_release.yml b/.github/workflows/basic_cli_build_release.yml index a9c783d0f2..b9243dceed 100644 --- a/.github/workflows/basic_cli_build_release.yml +++ b/.github/workflows/basic_cli_build_release.yml @@ -24,13 +24,13 @@ jobs: # does a build with the surgical linker and also with the legacy linker - run: ./ci/build_basic_cli.sh linux_x86_64 "--linker legacy" - - name: Save .rh1, .rm1 and .o file + - name: Save .rh1, .rm2 and .o file uses: actions/upload-artifact@v3 with: name: linux-x86_64-files path: | + basic-cli/src/metadata_linux-x86_64.rm2 basic-cli/src/linux-x86_64.rh1 - basic-cli/src/metadata_linux-x86_64.rm1 basic-cli/src/linux-x86_64.o build-macos-x86_64-files: diff --git a/crates/linker/src/lib.rs b/crates/linker/src/lib.rs index 6f55dd34b0..a739993a22 100644 --- a/crates/linker/src/lib.rs +++ b/crates/linker/src/lib.rs @@ -96,7 +96,7 @@ pub fn build_and_preprocess_host( fn metadata_file_name(target: &Triple) -> String { let target_triple_str = get_target_triple_str(target); - format!("metadata_{}.rm1", target_triple_str.unwrap_or("unknown")) + format!("metadata_{}.rm2", target_triple_str.unwrap_or("unknown")) } pub fn link_preprocessed_host( diff --git a/crates/packaging/src/tarball.rs b/crates/packaging/src/tarball.rs index c6f3211c05..7c894584da 100644 --- a/crates/packaging/src/tarball.rs +++ b/crates/packaging/src/tarball.rs @@ -153,7 +153,7 @@ fn write_archive(path: &Path, writer: W) -> io::Result<()> { // surgical linker format Some("rh1"), // metadata file - Some("rm1"), + Some("rm2"), // legacy linker formats Some("o"), Some("obj"),