mirror of
https://github.com/roc-lang/roc.git
synced 2024-09-22 08:17:40 +03:00
fix building without llvm
This commit is contained in:
parent
3dce239bea
commit
8393604b58
@ -20,7 +20,8 @@ default = ["target-aarch64", "target-x86_64", "target-wasm32", "editor", "llvm"]
|
||||
wasm32-cli-run = ["target-wasm32", "run-wasm32"]
|
||||
i386-cli-run = ["target-x86"]
|
||||
|
||||
llvm = ["roc_build/llvm"]
|
||||
# TODO: change to roc_repl_cli/llvm once roc_repl can run without llvm.
|
||||
llvm = ["roc_build/llvm", "roc_repl_cli"]
|
||||
|
||||
editor = ["roc_editor"]
|
||||
|
||||
@ -59,7 +60,7 @@ roc_reporting = { path = "../reporting" }
|
||||
roc_error_macros = { path = "../error_macros" }
|
||||
roc_editor = { path = "../editor", optional = true }
|
||||
roc_linker = { path = "../linker" }
|
||||
roc_repl_cli = { path = "../repl_cli" }
|
||||
roc_repl_cli = { path = "../repl_cli", optional = true }
|
||||
clap = { version = "= 3.0.0-beta.5", default-features = false, features = ["std", "color", "suggestions"] }
|
||||
const_format = "0.2.22"
|
||||
bumpalo = { version = "3.8.0", features = ["collections"] }
|
||||
|
@ -63,10 +63,16 @@ fn main() -> io::Result<()> {
|
||||
}
|
||||
}
|
||||
Some((CMD_REPL, _)) => {
|
||||
roc_repl_cli::main()?;
|
||||
#[cfg(feature = "llvm")]
|
||||
{
|
||||
roc_repl_cli::main()?;
|
||||
|
||||
// Exit 0 if the repl exited normally
|
||||
Ok(0)
|
||||
// Exit 0 if the repl exited normally
|
||||
Ok(0)
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "llvm"))]
|
||||
todo!("enable roc repl without llvm");
|
||||
}
|
||||
Some((CMD_EDIT, matches)) => {
|
||||
match matches
|
||||
|
@ -179,7 +179,7 @@ pub fn gen_from_mono_module(
|
||||
_emit_debug_info: bool,
|
||||
) -> CodeGenTiming {
|
||||
match opt_level {
|
||||
OptLevel::Optimize => {
|
||||
OptLevel::Optimize | OptLevel::Size => {
|
||||
todo!("Return this error message in a better way: optimized builds not supported without llvm backend");
|
||||
}
|
||||
OptLevel::Normal | OptLevel::Development => {
|
||||
|
@ -14,7 +14,7 @@ rustyline = {git = "https://github.com/rtfeldman/rustyline", tag = "v9.1.1"}
|
||||
rustyline-derive = {git = "https://github.com/rtfeldman/rustyline", tag = "v9.1.1"}
|
||||
target-lexicon = "0.12.2"
|
||||
|
||||
roc_build = {path = "../compiler/build"}
|
||||
roc_build = {path = "../compiler/build", features = ["llvm"]}
|
||||
roc_collections = {path = "../compiler/collections"}
|
||||
roc_gen_llvm = {path = "../compiler/gen_llvm"}
|
||||
roc_load = {path = "../compiler/load"}
|
||||
|
Loading…
Reference in New Issue
Block a user