diff options
author | 2021-12-30 21:12:32 -0800 | |
---|---|---|
committer | 2021-12-30 21:12:32 -0800 | |
commit | e75c711c68896f5952793601f156c921c814caab (patch) | |
tree | f3b30e2281c7231d480bb84503d17b2370866ff9 /src/env.zig | |
parent | 8d031f13c0e04629d431176e211a31224b7618c0 (diff) | |
download | bun-e75c711c68896f5952793601f156c921c814caab.tar.gz bun-e75c711c68896f5952793601f156c921c814caab.tar.zst bun-e75c711c68896f5952793601f156c921c814caab.zip |
Upgrade to latest Zig, remove dependency on patched version of Zig (#96)
* Prepare to upgrade zig
* zig fmt
* AllocGate
* Update data_url.zig
* wip
* few files
* just headers now?
* I think everything works?
* Update mimalloc
* Update hash_map.zig
* Perf improvements to compensate for Allocgate
* Bump
* :camera:
* Update bun.lockb
* Less branching
* [js parser] Slightly reduce memory usage
* Update js_parser.zig
* WIP remove unused
* [JS parser] WIP support for `with` keyword
* Remove more dead code
* Fix all the build errors!
* cleanup
* Move `network_thread` up
* Bump peechy
* Update README.md
Diffstat (limited to 'src/env.zig')
-rw-r--r-- | src/env.zig | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/env.zig b/src/env.zig index bdf3c2ae7..0c6f69213 100644 --- a/src/env.zig +++ b/src/env.zig @@ -1,10 +1,11 @@ const std = @import("std"); +const builtin = @import("builtin"); pub const BuildTarget = enum { native, wasm, wasi }; pub const build_target: BuildTarget = brk: { - if (std.Target.current.isWasm() and std.Target.current.getOsTag() == .wasi) { + if (@import("builtin").target.isWasm() and @import("builtin").target.getOsTag() == .wasi) { break :brk BuildTarget.wasi; - } else if (std.Target.current.isWasm()) { + } else if (@import("builtin").target.isWasm()) { break :brk BuildTarget.wasm; } else { break :brk BuildTarget.native; @@ -14,15 +15,15 @@ pub const build_target: BuildTarget = brk: { pub const isWasm = build_target == .wasm; pub const isNative = build_target == .native; pub const isWasi = build_target == .wasi; -pub const isMac = build_target == .native and std.Target.current.os.tag == .macos; +pub const isMac = build_target == .native and @import("builtin").target.os.tag == .macos; pub const isBrowser = !isWasi and isWasm; -pub const isWindows = std.Target.current.os.tag == .windows; -pub const isDebug = std.builtin.Mode.Debug == std.builtin.mode; -pub const isRelease = std.builtin.Mode.Debug != std.builtin.mode and !isTest; -pub const isTest = std.builtin.is_test; -pub const isLinux = std.Target.current.os.tag == .linux; -pub const isAarch64 = std.Target.current.cpu.arch.isAARCH64(); -pub const isX86 = std.Target.current.cpu.arch.isX86(); -pub const isX64 = std.Target.current.cpu.arch == .x86_64; +pub const isWindows = @import("builtin").target.os.tag == .windows; +pub const isDebug = std.builtin.Mode.Debug == @import("builtin").mode; +pub const isRelease = std.builtin.Mode.Debug != @import("builtin").mode and !isTest; +pub const isTest = @import("builtin").is_test; +pub const isLinux = @import("builtin").target.os.tag == .linux; +pub const isAarch64 = @import("builtin").target.cpu.arch.isAARCH64(); +pub const isX86 = @import("builtin").target.cpu.arch.isX86(); +pub const isX64 = @import("builtin").target.cpu.arch == .x86_64; pub const allow_assert = isDebug or isTest; pub const analytics_url = if (isDebug) "http://localhost:4000/events" else "http://i.bun.sh/events"; |