mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-09 15:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build system: remove setLinkerScriptContents

Browse source
This commit is contained in:
Andrew Kelley 2017-04-28 10:46:01 -04:00
parent a147f06585
commit d04d3ec775
1 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
std/build.zig
View file

@ -609,19 +609,13 @@ const Target = enum {
}
};
const LinkerScript = enum {
None,
Embed: []const u8,
Path: []const u8,
};
pub const LibExeObjStep = struct {
step: Step,
builder: &Builder,
root_src: ?[]const u8,
name: []const u8,
target: Target,
linker_script: LinkerScript,
linker_script: ?[]const u8,
link_libs: BufSet,
verbose: bool,
release: bool,
@ -679,7 +673,7 @@ pub const LibExeObjStep = struct {
.root_src = root_src,
.name = name,
.target = Target.Native,
.linker_script = LinkerScript.None,
.linker_script = null,
.link_libs = BufSet.init(builder.allocator),
.step = Step.init(name, builder.allocator, make),
.output_path = null,
@ -726,14 +720,8 @@ pub const LibExeObjStep = struct {
self.computeOutFileNames();
}
/// LibExeObjStep keeps a reference to script for its lifetime or until this function
/// is called again.
pub fn setLinkerScriptContents(self: &LibExeObjStep, script: []const u8) {
self.linker_script = LinkerScript.Embed { script };
}
pub fn setLinkerScriptPath(self: &LibExeObjStep, path: []const u8) {
self.linker_script = LinkerScript.Path { path };
self.linker_script = path;
}
pub fn linkSystemLibrary(self: &LibExeObjStep, name: []const u8) {
@ -852,19 +840,9 @@ pub const LibExeObjStep = struct {
},
}
switch (self.linker_script) {
LinkerScript.None => {},
LinkerScript.Embed => |script| {
const tmp_file_name = "linker.ld.tmp"; // TODO issue #298
io.writeFile(tmp_file_name, script, builder.allocator)
%% |err| debug.panic("unable to write linker script: {}\n", @errorName(err));
%%zig_args.append("--linker-script");
%%zig_args.append(tmp_file_name);
},
LinkerScript.Path => |path| {
%%zig_args.append("--linker-script");
%%zig_args.append(path);
},
test (self.linker_script) |linker_script| {
%%zig_args.append("--linker-script");
%%zig_args.append(linker_script);
}
{