From 9b43bf406402cfdbba51dce1a36a22c1abd69735 Mon Sep 17 00:00:00 2001 From: Logan Lowder Date: Sat, 30 Oct 2021 13:11:37 -0500 Subject: [PATCH 1/3] Update macOS docs regarding llvm See more details here: https://github.com/rtfeldman/roc/issues/1843 --- BUILDING_FROM_SOURCE.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BUILDING_FROM_SOURCE.md b/BUILDING_FROM_SOURCE.md index a531e22169..1b6cf814a5 100644 --- a/BUILDING_FROM_SOURCE.md +++ b/BUILDING_FROM_SOURCE.md @@ -50,8 +50,12 @@ If you want to install it manually, you can also download Zig directly [here](ht **version: 12.0.x** For macOS, you can install LLVM 12 using `brew install llvm@12` and then adding -`/usr/local/opt/llvm/bin` to your `PATH`. You can confirm this worked by +`/usr/local/opt/llvm@12/bin` to your `PATH`. You can confirm this worked by running `llc --version` - it should mention "LLVM version 12.0.0" at the top. +You may also need to manually specify a prefix env var like so: +``` +export LLVM_SYS_120_PREFIX=/usr/local/opt/llvm@12 +``` For Ubuntu and Debian: ``` From ef3ec61822bfe84307b2b400a225393c578fa692 Mon Sep 17 00:00:00 2001 From: Logan Lowder Date: Sat, 30 Oct 2021 13:14:56 -0500 Subject: [PATCH 2/3] Correct incorrectly ordered commands `clang` maps to `clang-12` and `llvm-as` maps to `llvm-as-12` --- BUILDING_FROM_SOURCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILDING_FROM_SOURCE.md b/BUILDING_FROM_SOURCE.md index 1b6cf814a5..df825d2935 100644 --- a/BUILDING_FROM_SOURCE.md +++ b/BUILDING_FROM_SOURCE.md @@ -66,7 +66,7 @@ chmod +x llvm.sh ``` If you use this script, you'll need to add `clang` and `llvm-as` to your `PATH`. -By default, the script installs them as `llvm-as-12` and `clang-12`, +By default, the script installs them as `clang-12` and `llvm-as-12`, respectively. You can address this with symlinks like so: ``` From a8e05e31c0be728378ae224437bf5a26393fb59f Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Sat, 30 Oct 2021 19:01:51 -0400 Subject: [PATCH 3/3] Add Logan Lowder to AUTHORS --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 6aee48b7d8..52c85f4493 100644 --- a/AUTHORS +++ b/AUTHORS @@ -42,4 +42,4 @@ Viktor Fröberg Locria Cyber Matthias Beyer Tim Whiting - +Logan Lowder