Skip to content

Commit

Permalink
fix: update LLVM features to minimum supported by mac arm
Browse files Browse the repository at this point in the history
  • Loading branch information
Shadow53 committed Dec 21, 2024
1 parent 916bd66 commit 6a99c2c
Show file tree
Hide file tree
Showing 13 changed files with 78 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
os: [macos-latest, ubuntu-latest]
rust:
- stable
llvm_version: [12, 13]
llvm_version: [15, 16]
env:
C_SDK_VERSION: v0.1.1
LLVM_VERSION: ${{ matrix.llvm_version }}
Expand Down
54 changes: 10 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ version = "0.5.0"
features = ["target-x86"]

[dev-dependencies]
insta = "1.8.0"
insta = { version = "1.8.0", features = ["json"] }
trycmd = "0.15.8"

[features]
cli = ["clap"]
output = ["qcs"] # Enables the `output` module
default = ["serde_support", "cli", "output"]
llvm12-0 = ["inkwell/llvm12-0"]
llvm13-0 = ["inkwell/llvm13-0"]
default = ["serde_support", "cli", "output", "llvm16-0"]
llvm15-0 = ["inkwell/llvm15-0"]
llvm16-0 = ["inkwell/llvm16-0"]
serde_support = ["serde", "serde_json"]

[[bin]]
Expand Down
4 changes: 2 additions & 2 deletions Makefile.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[env]
RUST_BACKTRACE = 0
LLVM_FEATURE = { value = "llvm13-0", condition = { env_not_set = [
LLVM_FEATURE = { value = "llvm16-0", condition = { env_not_set = [
"LLVM_FEATURE",
] } }
LLVM_SYS_130_PREFIX = { value = "/opt/homebrew/opt/llvm@13", condition = { platforms = ["mac"] } }
LLVM_SYS_160_PREFIX = { value = "/opt/homebrew/opt/llvm@16", condition = { platforms = ["mac"] } }
PROFILE = { value = "dev", condition = { env_not_set = ["PROFILE"] } }
NO_C_SDK_BUILD = { value = "0", condition = { env_not_set = [
"NO_C_SDK_BUILD",
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -xeo pipefail

# set defaults for dynamic CI variables when local/testing
C_SDK_VERSION="${C_SDK_VERSION:-v0.1.1}"
LLVM_VERSION="${LLVM_VERSION:-13}"
LLVM_VERSION="${LLVM_VERSION:-16}"
LLVM_FULL_VERSION="${LLVM_FULL_VERSION:-0.1}"
TESTING_TAG="${TESTING_TAG:-v0.0.0-local}"
TAG=${TAG:-$TESTING_TAG}
Expand Down
2 changes: 1 addition & 1 deletion src/context/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use inkwell::{
};

fn build_string_type(context: &Context) -> PointerType {
context.i8_type().ptr_type(AddressSpace::default())
context.ptr_type(AddressSpace::default())
}

const TYPE_NAME_EXECUTION_RESULT: &str = "ExecutionResult";
Expand Down
Loading

0 comments on commit 6a99c2c

Please sign in to comment.