diff --git a/CMakeLists.txt b/CMakeLists.txt index 70d1fde6bb..9c215c91cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -601,7 +601,6 @@ set(ZIG_STAGE2_SOURCES src/link/Elf/Archive.zig src/link/Elf/Atom.zig src/link/Elf/AtomList.zig - src/link/Elf/LdScript.zig src/link/Elf/LinkerDefined.zig src/link/Elf/Merge.zig src/link/Elf/Object.zig @@ -615,6 +614,7 @@ set(ZIG_STAGE2_SOURCES src/link/Elf/relocatable.zig src/link/Elf/relocation.zig src/link/Elf/synthetic_sections.zig + src/link/LdScript.zig src/link/MachO.zig src/link/MachO/Archive.zig src/link/MachO/Atom.zig diff --git a/src/link/Elf.zig b/src/link/Elf.zig index c8822d3f29..494cb94932 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1,4 +1,5 @@ pub const Atom = @import("Elf/Atom.zig"); +pub const LdScript = @import("LdScript.zig"); base: link.File, rpath_table: std.StringArrayHashMapUnmanaged(void), @@ -5625,7 +5626,6 @@ const GnuHashSection = synthetic_sections.GnuHashSection; const GotSection = synthetic_sections.GotSection; const GotPltSection = synthetic_sections.GotPltSection; const HashSection = synthetic_sections.HashSection; -const LdScript = @import("Elf/LdScript.zig"); const LinkerDefined = @import("Elf/LinkerDefined.zig"); const Liveness = @import("../Liveness.zig"); const LlvmObject = @import("../codegen/llvm.zig").Object; diff --git a/src/link/Elf/LdScript.zig b/src/link/LdScript.zig similarity index 99% rename from src/link/Elf/LdScript.zig rename to src/link/LdScript.zig index ff7c01b119..9c10656f3c 100644 --- a/src/link/Elf/LdScript.zig +++ b/src/link/LdScript.zig @@ -442,7 +442,7 @@ const TokenIterator = struct { }; const LdScript = @This(); -const Diags = @import("../../link.zig").Diags; +const Diags = @import("../link.zig").Diags; const std = @import("std"); const assert = std.debug.assert;