.envrc

@@ -1,8 +0,0 @@
-# vi: ft=sh
-# shellcheck shell=bash
-
-if ! has zvm_direnv_version || ! zvm_direnv_version 1.0.0; then
-  source_url "https://git.lerch.org/lobo/zvm-direnv/raw/tag/1.0.0/direnvrc" "sha256-Gtddvcr6aJsrjKd53uChxA1reQmJgEBpmPUWmMdtDIQ="
-fi
-
-use zig mach-latest

build.zig

@@ -29,12 +29,6 @@ pub fn build(b: *Builder) !void {
     // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
     const optimize = b.standardOptimizeOption(.{});
 
-    const no_llvm = b.option(
-        bool,
-        "no-llvm",
-        "Disable LLVM",
-    ) orelse false;
-
     const broken_windows = b.option(
         bool,
         "broken-windows",
@@ -58,7 +52,6 @@ pub fn build(b: *Builder) !void {
         .target = target,
         .optimize = optimize,
     });
-    exe.use_llvm = !no_llvm;
     const smithy_dep = b.dependency("smithy", .{
         // These are the arguments to the dependency. It expects a target and optimization level.
         .target = target,
@@ -107,10 +100,9 @@ pub fn build(b: *Builder) !void {
             .name = "codegen",
             .root_source_file = b.path("codegen/src/main.zig"),
             // We need this generated for the host, not the real target
-            .target = b.graph.host,
+            .target = b.host,
             .optimize = if (b.verbose) .Debug else .ReleaseSafe,
         });
-        cg_exe.use_llvm = !no_llvm;
         cg_exe.root_module.addImport("smithy", smithy_dep.module("smithy"));
         var cg_cmd = b.addRunArtifact(cg_exe);
         cg_cmd.addArg("--models");
@@ -187,7 +179,6 @@ pub fn build(b: *Builder) !void {
         });
         unit_tests.root_module.addImport("smithy", smithy_dep.module("smithy"));
         unit_tests.step.dependOn(gen_step);
-        unit_tests.use_llvm = !no_llvm;
 
         const run_unit_tests = b.addRunArtifact(unit_tests);
         run_unit_tests.skip_foreign_checks = true;
@@ -209,7 +200,6 @@ pub fn build(b: *Builder) !void {
         .target = target,
         .optimize = optimize,
     });
-    smoke_test.use_llvm = !no_llvm;
     smoke_test.root_module.addImport("smithy", smithy_dep.module("smithy"));
     smoke_test.step.dependOn(gen_step);