mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiler: Move vendored library support to libs subdirectory.

Browse Source
This commit is contained in:
Alex Rønne Petersen 2025-04-21 07:05:02 +02:00
parent 309ff9c34e
commit 610d3cf9de
No known key found for this signature in database
14 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -586,11 +586,11 @@ set(ZIG_STAGE2_SOURCES
src/codegen/spirv/spec.zig src/codegen/spirv/spec.zig
src/crash_report.zig src/crash_report.zig
src/dev.zig src/dev.zig
src/glibc.zig src/libs/glibc.zig
src/introspect.zig src/introspect.zig
src/libcxx.zig src/libs/libcxx.zig
src/libtsan.zig src/libs/libtsan.zig
src/libunwind.zig src/libs/libunwind.zig
src/link.zig src/link.zig
src/link/C.zig src/link/C.zig
src/link/Coff.zig src/link/Coff.zig
@ -664,8 +664,8 @@ set(ZIG_STAGE2_SOURCES
src/link/tapi/yaml.zig src/link/tapi/yaml.zig
src/link/tapi/yaml/test.zig src/link/tapi/yaml/test.zig
src/main.zig src/main.zig
src/mingw.zig src/libs/mingw.zig
src/musl.zig src/libs/musl.zig
src/mutable_value.zig src/mutable_value.zig
src/print_air.zig src/print_air.zig
src/print_env.zig src/print_env.zig
@ -676,7 +676,7 @@ set(ZIG_STAGE2_SOURCES
src/target.zig src/target.zig
src/tracy.zig src/tracy.zig
src/translate_c.zig src/translate_c.zig
src/wasi_libc.zig src/libs/wasi_libc.zig
) )
if(MSVC) if(MSVC)

14
src/Compilation.zig
View File

@ -21,12 +21,12 @@ const tracy = @import("tracy.zig");
const trace = tracy.trace; const trace = tracy.trace;
const build_options = @import("build_options"); const build_options = @import("build_options");
const LibCInstallation = std.zig.LibCInstallation; const LibCInstallation = std.zig.LibCInstallation;
const glibc = @import("glibc.zig"); const glibc = @import("libs/glibc.zig");
const musl = @import("musl.zig"); const musl = @import("libs/musl.zig");
const mingw = @import("mingw.zig"); const mingw = @import("libs/mingw.zig");
const libunwind = @import("libunwind.zig"); const libunwind = @import("libs/libunwind.zig");
const libcxx = @import("libcxx.zig"); const libcxx = @import("libs/libcxx.zig");
const wasi_libc = @import("wasi_libc.zig"); const wasi_libc = @import("libs/wasi_libc.zig");
const fatal = @import("main.zig").fatal; const fatal = @import("main.zig").fatal;
const clangMain = @import("main.zig").clangMain; const clangMain = @import("main.zig").clangMain;
const Zcu = @import("Zcu.zig"); const Zcu = @import("Zcu.zig");
@ -34,7 +34,7 @@ const Sema = @import("Sema.zig");
const InternPool = @import("InternPool.zig"); const InternPool = @import("InternPool.zig");
const Cache = std.Build.Cache; const Cache = std.Build.Cache;
const c_codegen = @import("codegen/c.zig"); const c_codegen = @import("codegen/c.zig");
const libtsan = @import("libtsan.zig"); const libtsan = @import("libs/libtsan.zig");
const Zir = std.zig.Zir; const Zir = std.zig.Zir;
const Air = @import("Air.zig"); const Air = @import("Air.zig");
const Builtin = @import("Builtin.zig"); const Builtin = @import("Builtin.zig");

8
src/glibc.zig → src/libs/glibc.zig
View File

@ -8,12 +8,12 @@ const assert = std.debug.assert;
const Version = std.SemanticVersion; const Version = std.SemanticVersion;
const Path = std.Build.Cache.Path; const Path = std.Build.Cache.Path;
const Compilation = @import("Compilation.zig"); const Compilation = @import("../Compilation.zig");
const build_options = @import("build_options"); const build_options = @import("build_options");
const trace = @import("tracy.zig").trace; const trace = @import("../tracy.zig").trace;
const Cache = std.Build.Cache; const Cache = std.Build.Cache;
const Module = @import("Package/Module.zig"); const Module = @import("../Package/Module.zig");
const link = @import("link.zig"); const link = @import("../link.zig");
pub const Lib = struct { pub const Lib = struct {
name: []const u8, name: []const u8,

8
src/libcxx.zig → src/libs/libcxx.zig
View File

@ -2,11 +2,11 @@ const std = @import("std");
const path = std.fs.path; const path = std.fs.path;
const assert = std.debug.assert; const assert = std.debug.assert;
const target_util = @import("target.zig"); const target_util = @import("../target.zig");
const Compilation = @import("Compilation.zig"); const Compilation = @import("../Compilation.zig");
const build_options = @import("build_options"); const build_options = @import("build_options");
const trace = @import("tracy.zig").trace; const trace = @import("../tracy.zig").trace;
const Module = @import("Package/Module.zig"); const Module = @import("../Package/Module.zig");
const libcxxabi_files = [_][]const u8{ const libcxxabi_files = [_][]const u8{
"src/abort_message.cpp", "src/abort_message.cpp",

6
src/libtsan.zig → src/libs/libtsan.zig
View File

@ -1,10 +1,10 @@
const std = @import("std"); const std = @import("std");
const assert = std.debug.assert; const assert = std.debug.assert;
const Compilation = @import("Compilation.zig"); const Compilation = @import("../Compilation.zig");
const build_options = @import("build_options"); const build_options = @import("build_options");
const trace = @import("tracy.zig").trace; const trace = @import("../tracy.zig").trace;
const Module = @import("Package/Module.zig"); const Module = @import("../Package/Module.zig");
pub const BuildError = error{ pub const BuildError = error{
OutOfMemory, OutOfMemory,

8
src/libunwind.zig → src/libs/libunwind.zig
View File

@ -2,11 +2,11 @@ const std = @import("std");
const path = std.fs.path; const path = std.fs.path;
const assert = std.debug.assert; const assert = std.debug.assert;
const target_util = @import("target.zig"); const target_util = @import("../target.zig");
const Compilation = @import("Compilation.zig"); const Compilation = @import("../Compilation.zig");
const Module = @import("Package/Module.zig"); const Module = @import("../Package/Module.zig");
const build_options = @import("build_options"); const build_options = @import("build_options");
const trace = @import("tracy.zig").trace; const trace = @import("../tracy.zig").trace;
pub const BuildError = error{ pub const BuildError = error{
OutOfMemory, OutOfMemory,

6
src/mingw.zig → src/libs/mingw.zig
View File

@ -6,10 +6,10 @@ const assert = std.debug.assert;
const log = std.log.scoped(.mingw); const log = std.log.scoped(.mingw);
const builtin = @import("builtin"); const builtin = @import("builtin");
const Compilation = @import("Compilation.zig"); const Compilation = @import("../Compilation.zig");
const build_options = @import("build_options"); const build_options = @import("build_options");
const Cache = std.Build.Cache; const Cache = std.Build.Cache;
const dev = @import("dev.zig"); const dev = @import("../dev.zig");
pub const CrtFile = enum { pub const CrtFile = enum {
crt2_o, crt2_o,
@ -348,7 +348,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
errdefer gpa.free(lib_final_path); errdefer gpa.free(lib_final_path);
if (!build_options.have_llvm) return error.ZigCompilerNotBuiltWithLLVMExtensions; if (!build_options.have_llvm) return error.ZigCompilerNotBuiltWithLLVMExtensions;
const llvm_bindings = @import("codegen/llvm/bindings.zig"); const llvm_bindings = @import("../codegen/llvm/bindings.zig");
const def_final_path_z = try arena.dupeZ(u8, def_final_path); const def_final_path_z = try arena.dupeZ(u8, def_final_path);
const lib_final_path_z = try comp.global_cache_directory.joinZ(arena, &.{lib_final_path}); const lib_final_path_z = try comp.global_cache_directory.joinZ(arena, &.{lib_final_path});
if (llvm_bindings.WriteImportLibrary( if (llvm_bindings.WriteImportLibrary(

4
src/musl.zig → src/libs/musl.zig
View File

@ -3,9 +3,9 @@ const Allocator = std.mem.Allocator;
const mem = std.mem; const mem = std.mem;
const path = std.fs.path; const path = std.fs.path;
const assert = std.debug.assert; const assert = std.debug.assert;
const Module = @import("Package/Module.zig"); const Module = @import("../Package/Module.zig");
const Compilation = @import("Compilation.zig"); const Compilation = @import("../Compilation.zig");
const build_options = @import("build_options"); const build_options = @import("build_options");
pub const CrtFile = enum { pub const CrtFile = enum {

2
src/wasi_libc.zig → src/libs/wasi_libc.zig
View File

@ -3,7 +3,7 @@ const mem = std.mem;
const path = std.fs.path; const path = std.fs.path;
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
const Compilation = @import("Compilation.zig"); const Compilation = @import("../Compilation.zig");
const build_options = @import("build_options"); const build_options = @import("build_options");
pub const CrtFile = enum { pub const CrtFile = enum {

2
src/link.zig
View File

@ -6,7 +6,7 @@ const fs = std.fs;
const mem = std.mem; const mem = std.mem;
const log = std.log.scoped(.link); const log = std.log.scoped(.link);
const trace = @import("tracy.zig").trace; const trace = @import("tracy.zig").trace;
const wasi_libc = @import("wasi_libc.zig"); const wasi_libc = @import("libs/wasi_libc.zig");
const Air = @import("Air.zig"); const Air = @import("Air.zig");
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;

4
src/link/Elf.zig
View File

@ -5279,9 +5279,9 @@ const codegen = @import("../codegen.zig");
const dev = @import("../dev.zig"); const dev = @import("../dev.zig");
const eh_frame = @import("Elf/eh_frame.zig"); const eh_frame = @import("Elf/eh_frame.zig");
const gc = @import("Elf/gc.zig"); const gc = @import("Elf/gc.zig");
const glibc = @import("../glibc.zig"); const glibc = @import("../libs/glibc.zig");
const link = @import("../link.zig"); const link = @import("../link.zig");
const musl = @import("../musl.zig"); const musl = @import("../libs/musl.zig");
const relocatable = @import("Elf/relocatable.zig"); const relocatable = @import("Elf/relocatable.zig");
const relocation = @import("Elf/relocation.zig"); const relocation = @import("Elf/relocation.zig");
const target_util = @import("../target.zig"); const target_util = @import("../target.zig");

2
src/link/Wasm.zig
View File

@ -44,7 +44,7 @@ const dev = @import("../dev.zig");
const link = @import("../link.zig"); const link = @import("../link.zig");
const lldMain = @import("../main.zig").lldMain; const lldMain = @import("../main.zig").lldMain;
const trace = @import("../tracy.zig").trace; const trace = @import("../tracy.zig").trace;
const wasi_libc = @import("../wasi_libc.zig"); const wasi_libc = @import("../libs/wasi_libc.zig");
const Value = @import("../Value.zig"); const Value = @import("../Value.zig");
base: link.File, base: link.File,

4
src/main.zig
View File

@ -28,11 +28,11 @@ const link = @import("link.zig");
const Package = @import("Package.zig"); const Package = @import("Package.zig");
const build_options = @import("build_options"); const build_options = @import("build_options");
const introspect = @import("introspect.zig"); const introspect = @import("introspect.zig");
const wasi_libc = @import("wasi_libc.zig"); const wasi_libc = @import("libs/wasi_libc.zig");
const target_util = @import("target.zig"); const target_util = @import("target.zig");
const crash_report = @import("crash_report.zig"); const crash_report = @import("crash_report.zig");
const Zcu = @import("Zcu.zig"); const Zcu = @import("Zcu.zig");
const mingw = @import("mingw.zig"); const mingw = @import("libs/mingw.zig");
const dev = @import("dev.zig"); const dev = @import("dev.zig");
test { test {

2
src/print_targets.zig
View File

@ -7,7 +7,7 @@ const Allocator = std.mem.Allocator;
const Target = std.Target; const Target = std.Target;
const target = @import("target.zig"); const target = @import("target.zig");
const assert = std.debug.assert; const assert = std.debug.assert;
const glibc = @import("glibc.zig"); const glibc = @import("libs/glibc.zig");
const introspect = @import("introspect.zig"); const introspect = @import("introspect.zig");
const fatal = @import("main.zig").fatal; const fatal = @import("main.zig").fatal;