Merge pull request #113 from matt-cornell/no-llvm-15

Disable LLVM 15

Author: matt-cornell

README.md

@@ -8,7 +8,7 @@ To build from source, use:
 ```bash
 cargo install --git https://github.com/matt-cornell/cobalt-lang
 ```
-By default, builds link dynamically to LLVM 16. They can also statically link to it by enabling the `prefer-static` or `force-static` features. LLVM 15 can be linked to instead with the `llvm-15` feature.
+By default, builds link dynamically to LLVM 16. They can also statically link to it by enabling the `prefer-static` or `force-static` features.
 ## Language features
 - Modern programming features without a focus on compatibility with an outdated standard
   - First-class functions, arrays, and types

cobalt-llvm/Cargo.toml

@@ -9,9 +9,8 @@ description.workspace = true
 documentation.workspace = true
 
 [dependencies]
-inkwell = { version = "0.2.0" }
-llvm-sys-15 = { package = "llvm-sys", version = "150", optional = true }
-llvm-sys-16 = { package = "llvm-sys", version = "160", optional = true }
+inkwell = { version = "0.2.0", features = ["llvm16-0"] }
+llvm-sys = "160"
 
 [build-dependencies]
 lazy_static = "1.4"
@@ -21,13 +20,11 @@ semver = "1.0"
 
 # features passed to llvm-sys
 [features]
-default = ["strict-versioning", "prefer-dynamic", "llvm-16"]
-llvm-15 = ["inkwell/llvm15-0", "llvm-sys-15"]
-llvm-16 = ["inkwell/llvm16-0", "llvm-sys-16"]
-strict-versioning = ["llvm-sys-15/strict-versioning", "llvm-sys-16/strict-versioning"]
-no-llvm-linking = ["llvm-sys-15/no-llvm-linking", "llvm-sys-16/no-llvm-linking"]
+default = ["strict-versioning", "prefer-dynamic"]
+strict-versioning = ["llvm-sys/strict-versioning"]
+no-llvm-linking = ["llvm-sys/no-llvm-linking"]
 
-prefer-dynamic = ["llvm-sys-15/prefer-dynamic", "llvm-sys-16/prefer-dynamic"]
-force-dynamic = ["llvm-sys-15/force-dynamic", "llvm-sys-16/force-dynamic"]
-prefer-static = ["llvm-sys-15/prefer-static", "llvm-sys-16/prefer-static"]
-force-static = ["llvm-sys-15/force-static", "llvm-sys-16/force-static"]
+prefer-dynamic = ["llvm-sys/prefer-dynamic"]
+force-dynamic = ["llvm-sys/force-dynamic"]
+prefer-static = ["llvm-sys/prefer-static"]
+force-static = ["llvm-sys/force-static"]

cobalt-llvm/build.rs

@@ -13,12 +13,6 @@ use std::io::{self, ErrorKind};
 use std::path::PathBuf;
 use std::process::Command;
 
-#[cfg(not(any(feature = "llvm-15", feature = "llvm-16")))]
-compile_error!("Either LLVM 15 or LLVM 16 must be specified!");
-
-#[cfg(feature = "llvm-15")]
-const LLVM_MAJOR: u64 = 15;
-#[cfg(feature = "llvm-16")]
 const LLVM_MAJOR: u64 = 16;
 
 // Environment variables that can guide compilation
@@ -35,13 +29,11 @@ static ENV_FORCE_FFI: &str = formatcp!("LLVM_SYS_{LLVM_MAJOR}_FFI_WORKAROUND");
 lazy_static! {
     /// LLVM version used by this version of the crate.
     static ref CRATE_VERSION: Version = {
-        let crate_version = Version::parse(env!("CARGO_PKG_VERSION"))
-            .expect("Crate version is somehow not valid semver");
-        Version {
-            major: LLVM_MAJOR,
-            minor: 0,
-            .. crate_version
-        }
+        Version::new(
+            LLVM_MAJOR,
+            0,
+            0
+        )
     };
 
     /// Filesystem path to an llvm-config binary for the correct version.
@@ -168,7 +160,7 @@ fn is_compatible_llvm(llvm_version: &Version) -> bool {
     if strict {
         llvm_version.major == CRATE_VERSION.major && llvm_version.minor == CRATE_VERSION.minor
     } else {
-        llvm_version.major >= CRATE_VERSION.major
+        llvm_version.major == CRATE_VERSION.major
             || (llvm_version.major == CRATE_VERSION.major
                 && llvm_version.minor >= CRATE_VERSION.minor)
     }

cobalt-llvm/src/lib.rs

@@ -1,33 +1,4 @@
-#[cfg(feature = "llvm-15")]
-pub use llvm_sys_15 as llvm_sys;
-
-#[cfg(feature = "llvm-16")]
-pub use llvm_sys_16 as llvm_sys;
-
+pub use llvm_sys;
 pub use inkwell;
 
-pub const LLVM_VERSION: &str = env!("LLVM_VERSION");
-
-#[cfg(feature = "llvm-15")]
-#[macro_export]
-macro_rules! if_llvm_15 {
-    ($($tok:tt)*) => {$($tok)*}
-}
-
-#[cfg(not(feature = "llvm-15"))]
-#[macro_export]
-macro_rules! if_llvm_15 {
-    ($($tok:tt)*) => {};
-}
-
-#[cfg(feature = "llvm-16")]
-#[macro_export]
-macro_rules! if_llvm_16 {
-    ($($tok:tt)*) => {$($tok)*}
-}
-
-#[cfg(not(feature = "llvm-16"))]
-#[macro_export]
-macro_rules! if_llvm_16 {
-    ($($tok:tt)*) => {};
-}
+pub const LLVM_VERSION: &str = env!("LLVM_VERSION");