roc-lang · lukewilliamboswell · Jul 2, 2024 · Jul 9, 2024 · Jul 9, 2024 · Jul 9, 2024
diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs
@@ -70,7 70,7 @@ pub const FLAG_TARGET: &str = "target";
 pub const FLAG_TIME: &str = "time";
 pub const FLAG_VERBOSE: &str = "verbose";
 pub const FLAG_LINKER: &str = "linker";
-pub const FLAG_PREBUILT: &str = "prebuilt-platform";
 pub const FLAG_BUILD_HOST: &str = "build-host";
 pub const FLAG_CHECK: &str = "check";
 pub const FLAG_STDIN: &str = "stdin";
 pub const FLAG_STDOUT: &str = "stdout";
@@ -140,9 140,9 @@ pub fn build_app() -> Command {
  .value_parser(["surgical", "legacy"])
  .required(false);
 
- let flag_prebuilt = Arg::new(FLAG_PREBUILT)
- .long(FLAG_PREBUILT)
- .help("Assume the platform has been prebuilt and skip rebuilding the platform\n(This is enabled implicitly when using `roc build` with a --target other than `--target <current machine>`, unless the target is wasm.)")
  let flag_prebuilt = Arg::new(FLAG_BUILD_HOST)
  .long(FLAG_BUILD_HOST)
  .help("WARNING: platforms are responsible for building hosts, this flag will be removed when internal test platforms have a build script")
  .action(ArgAction::SetTrue)
  .required(false);
 
@@ -855,17 855,10 @@ pub fn build(
  LinkingStrategy::Surgical
  };
 
- let prebuilt = {
- let cross_compile = target != Target::default();
- let targeting_wasm = matches!(target.architecture(), Architecture::Wasm32);
-
- matches.get_flag(FLAG_PREBUILT) ||
- // When compiling for a different target, assume a prebuilt platform.
- // Otherwise compilation would most likely fail because many toolchains
- // assume you're compiling for the current machine. We make an exception
- // for Wasm, because cross-compiling is the norm in that case.
- (cross_compile && !targeting_wasm)
- };
  // TODO: remove once host rebuilding is no longer required
  // all hosts should be prebuilt, this flag keeps the rebuilding behvaiour
  // until no longer required for internal tests
  let rebuild_host = matches.get_flag(FLAG_BUILD_HOST);
 
  let fuzz = matches.get_flag(FLAG_FUZZ);
  if fuzz && !matches!(code_gen_backend, CodeGenBackend::Llvm(_)) {
@@ -901,7 894,7 @@ pub fn build(
  emit_timings,
  link_type,
  linking_strategy,
- prebuilt,
  rebuild_host,
  wasm_dev_stack_bytes,
  roc_cache_dir,
  load_config,

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
@@ -169,10 169,14 @@ fn main() -> io::Result<()> {
 
  let verbose_and_time = matches.get_one::<bool>(roc_cli::FLAG_VERBOSE).unwrap();
 
  let preprocessed_path = platform_path.with_file_name(target.prebuilt_surgical_host());
  let metadata_path = platform_path.with_file_name(target.metadata_file_name());
 
  roc_linker::preprocess_host(
  target,
  host_path,
- platform_path,
  metadata_path.as_path(),
  preprocessed_path.as_path(),
  dylib_path,
  *verbose_and_time,
  *verbose_and_time,

diff --git a/crates/cli/tests/cli_run.rs b/crates/cli/tests/cli_run.rs
@@ -55,8 55,6 @@ mod cli_run {
  const LINKER_FLAG: &str = concatcp!("--", roc_cli::FLAG_LINKER);
  const CHECK_FLAG: &str = concatcp!("--", roc_cli::FLAG_CHECK);
  #[allow(dead_code)]
- const PREBUILT_PLATFORM: &str = concatcp!("--", roc_cli::FLAG_PREBUILT);
- #[allow(dead_code)]
  const TARGET_FLAG: &str = concatcp!("--", roc_cli::FLAG_TARGET);
 
  #[derive(Debug)]
@@ -193,6 191,8 @@ mod cli_run {
  let flags = {
  let mut vec = flags.to_vec();
 
  vec.push("--build-host");
 
  // max-threads segfaults on windows right now
  if !cfg!(windows) {
  vec.push("--max-threads=1");
@@ -540,6 540,7 @@ mod cli_run {
  )
  }
 
  #[ignore = "TODO move this to roc-lang/examples repository"]
  #[test]
  fn platform_switching_swift() {
  test_roc_app_slim(
@@ -755,6 756,7 @@ mod cli_run {
  );
  }
 
  #[ignore = "TODO move this to roc-lang/examples repository"]
  #[test]
  #[cfg_attr(
  windows,
@@ -783,6 785,7 @@ mod cli_run {
  )
  }
 
  #[ignore = "TODO move this to roc-lang/examples repository"]
  #[test]
  fn hello_gui() {
  test_roc_app_slim("examples/gui", "hello-guiBROKEN.roc", "", UseValgrind::No)
@@ -941,6 944,7 @@ mod cli_run {
  )
  }
 
  #[ignore = "TODO move this to roc-lang/examples repository"]
  #[test]
  fn swift_ui() {
  test_roc_app_slim("examples/swiftui", "main.roc", "", UseValgrind::No)
@@ -1087,6 1091,7 @@ mod cli_run {
  )
  }
 
  #[ignore = "TODO move this to roc-lang/examples repository"]
  #[test]
  fn inspect_gui() {
  test_roc_app_slim("examples", "inspect-gui.roc", "", UseValgrind::No)
@@ -1100,7 1105,7 @@ mod cli_run {
  use cli_utils::helpers::cli_testing_dir;
 
  #[allow(unused_imports)]
- use super::{check_output_with_stdin, OPTIMIZE_FLAG, PREBUILT_PLATFORM};
  use super::{check_output_with_stdin, OPTIMIZE_FLAG};
 
  #[allow(unused_imports)]
  use std::{path::Path, sync::Once};
@@ -1178,7 1183,7 @@ mod cli_run {
  check_output_with_stdin(
  file_name,
  stdin,
- &[PREBUILT_PLATFORM],
  &[],
  &[],
  &[],
  expected_ending,
@@ -1190,7 1195,7 @@ mod cli_run {
  check_output_with_stdin(
  file_name,
  stdin,
- &[PREBUILT_PLATFORM, OPTIMIZE_FLAG],
  &[OPTIMIZE_FLAG],
  &[],
  &[],
  expected_ending,

diff --git a/crates/cli_utils/src/helpers.rs b/crates/cli_utils/src/helpers.rs
@@ -50,7 50,7 @@ where
 
 pub fn has_error(stderr: &str) -> bool {
  let stderr_stripped = stderr
- .replacen("🔨 Rebuilding platform...\n", "", 1)
  .replacen("🔨 Building host ...\n", "", 1)
  // for some reason, llvm prints out this warning when targeting windows
  .replacen(
  "warning: ignoring debug info with an invalid version (0) in app\r\n",

diff --git a/crates/compiler/build/src/link.rs b/crates/compiler/build/src/link.rs
@@ -42,26 42,50 @@ pub fn link(
  }
 }
 
-/// Same format as the precompiled host filename, except with a file extension like ".o" or ".obj"
-pub fn legacy_host_file(target: Target, platform_main_roc: &Path) -> PathBuf {
- let lib_ext = target.static_library_file_ext();
 /// Search for a prebuilt surgical host in the platform main directory.
 pub fn find_surgical_host(target: Target, platform_main_roc: &Path) -> Result<PathBuf, String> {
  let surgical_host_path = platform_main_roc.with_file_name(target.prebuilt_surgical_host());
 
- let file_name = roc_linker::preprocessed_host_filename(target)
- .replace(roc_linker::PRECOMPILED_HOST_EXT, lib_ext);
  let generic_host_path: PathBuf = platform_main_roc.with_file_name("host.rh");
 
- let lib_path = platform_main_roc.with_file_name(file_name);
  if generic_host_path.exists() {
  Ok(generic_host_path)
  } else if surgical_host_path.exists() {
  Ok(surgical_host_path)
  } else {
  Err(format!(
  "\n {}\n {}",
  surgical_host_path.display(),
  generic_host_path.display(),
  )
  .to_string())
  }
 }
 
- let default_host_path: PathBuf = platform_main_roc
- .with_file_name("libhost")
- .with_extension(lib_ext);
 /// Search for a prebuilt legacy host in the platform main directory.
 pub fn find_legacy_host(target: Target, platform_main_roc: &Path) -> Result<PathBuf, String> {
  let static_library_path = platform_main_roc.with_file_name(target.prebuilt_static_library());
 
  let static_object_path = platform_main_roc.with_file_name(target.prebuilt_static_object());
 
- if lib_path.exists() {
- lib_path
- } else if default_host_path.exists() {
- default_host_path
  let generic_host_path: PathBuf = platform_main_roc
  .with_file_name("libhost")
  .with_extension(target.static_library_file_ext());
 
  if static_library_path.exists() {
  Ok(static_library_path)
  } else if generic_host_path.exists() {
  Ok(generic_host_path)
  } else if static_object_path.exists() {
  Ok(static_object_path)
  } else {
- let obj_ext = target.object_file_ext();
- lib_path.with_extension(obj_ext)
  Err(format!(
  "\n {}\n {}\n {}",
  static_library_path.display(),
  static_object_path.display(),
  generic_host_path.display(),
  )
  .to_string())
  }
 }
 
@@ -457,6 481,7 @@ pub fn rebuild_host(
  };
 
  let host_dest = if matches!(target.architecture(), Architecture::Wasm32) {
  // TODO verify this is corect, how do we do get here with OptLevel::Development
  if matches!(opt_level, OptLevel::Development) {
  platform_main_roc.with_extension("o")
  } else {
@@ -467,7 492,7 @@ pub fn rebuild_host(
  .with_file_name("dynhost")
  .with_extension(executable_extension)
  } else {
- legacy_host_file(target, platform_main_roc)
  platform_main_roc.with_file_name(target.prebuilt_static_object())
  };
 
  let env_path = env::var("PATH").unwrap_or_else(|_| "".to_string());
@@ -1330,9 1355,9 @@ pub fn llvm_module_to_dylib(
  unsafe { Library::new(path) }
 }
 
-pub fn preprocess_host_wasm32(host_input_path: &Path, preprocessed_host_path: &Path) {
 pub fn preprocess_host_wasm32(host_input_path: &Path, host_output_path: &Path) {
  let host_input = host_input_path.to_str().unwrap();
- let output_file = preprocessed_host_path.to_str().unwrap();
  let output_file = host_output_path.to_str().unwrap();
 
  /*
  Notes: