From 08a3f0fb9ae29745953f69a80fa00bd42963b662 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Fri, 1 Oct 2021 13:06:32 -0500 Subject: [PATCH 1/2] Add 'a taste of roc' link to www --- www/public/index.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/public/index.html b/www/public/index.html index 7144f8368a..cccb3ab181 100644 --- a/www/public/index.html +++ b/www/public/index.html @@ -16,9 +16,10 @@

Roc's initial release is still under development, and this website is a placeholder until that release is ready.

In the meantime, if you'd like to learn more about Roc, here are some videos:

From f1ec5c30d02746208da38d53f0cb2c8aa9a077b8 Mon Sep 17 00:00:00 2001 From: Folkert Date: Fri, 1 Oct 2021 20:33:00 +0200 Subject: [PATCH 2/2] make things compile --- cli/src/build.rs | 2 ++ cli/src/main.rs | 7 ++++--- compiler/build/src/link.rs | 2 +- compiler/build/src/program.rs | 2 -- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cli/src/build.rs b/cli/src/build.rs index 85fc609717..e62ddb7043 100644 --- a/cli/src/build.rs +++ b/cli/src/build.rs @@ -3,6 +3,7 @@ use roc_build::{ link::{link, rebuild_host, LinkType}, program, }; +#[cfg(feature = "llvm")] use roc_builtins::bitcode; use roc_can::builtins::builtin_defs_map; use roc_collections::all::MutMap; @@ -11,6 +12,7 @@ use roc_mono::ir::OptLevel; use std::path::PathBuf; use std::time::{Duration, SystemTime}; use target_lexicon::Triple; +#[cfg(feature = "llvm")] use tempfile::Builder; fn report_timing(buf: &mut String, label: &str, duration: Duration) { diff --git a/cli/src/main.rs b/cli/src/main.rs index 739b341907..15a1de4b48 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -11,12 +11,13 @@ use std::path::{Path, PathBuf}; #[global_allocator] static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc; -#[cfg(feature = "llvm")] -use roc_cli::build; use std::ffi::{OsStr, OsString}; +#[cfg(feature = "llvm")] +use roc_cli::build; + #[cfg(not(feature = "llvm"))] -fn build(_target: &Triple, _matches: &clap::ArgMatches, _config: BuildConfig) -> io::Result { +fn build(_matches: &clap::ArgMatches, _config: BuildConfig) -> io::Result { panic!("Building without LLVM is not currently supported."); } diff --git a/compiler/build/src/link.rs b/compiler/build/src/link.rs index 2d3517ee60..d7a894838c 100644 --- a/compiler/build/src/link.rs +++ b/compiler/build/src/link.rs @@ -2,7 +2,7 @@ use crate::target::arch_str; #[cfg(feature = "llvm")] use libloading::{Error, Library}; use roc_builtins::bitcode; -#[cfg(feature = "llvm")] +// #[cfg(feature = "llvm")] use roc_mono::ir::OptLevel; use std::collections::HashMap; use std::env; diff --git a/compiler/build/src/program.rs b/compiler/build/src/program.rs index 226bfaf8be..7d9803e4be 100644 --- a/compiler/build/src/program.rs +++ b/compiler/build/src/program.rs @@ -2,11 +2,9 @@ use roc_gen_llvm::llvm::build::module_from_builtins; #[cfg(feature = "llvm")] pub use roc_gen_llvm::llvm::build::FunctionIterator; -#[cfg(feature = "llvm")] use roc_load::file::MonomorphizedModule; #[cfg(feature = "llvm")] use roc_mono::ir::OptLevel; -#[cfg(feature = "llvm")] use std::path::{Path, PathBuf}; use std::time::Duration;