Skip to content

Commit

Permalink
zig: ldc more config
Browse files Browse the repository at this point in the history
  • Loading branch information
@kassane
kassane committed Jan 11, 2024
1 parent 31b6053 commit 43d371b
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 26 deletions.
66 changes: 40 additions & 26 deletions build.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

const std = @import("std");
const builtin = @import("builtin");
const Builder = std.Build;
const CompileStep = Builder.Step.Compile;
const RunStep = Builder.Step.Run;
const CrossTarget = Builder.ResolvedTarget;
const Build = std.Build;
const CompileStep = Build.Step.Compile;
const RunStep = Build.Step.Run;
const CrossTarget = Build.ResolvedTarget;
const OptimizeMode = std.builtin.OptimizeMode;
const fmt = std.fmt;

Expand All @@ -31,7 +31,7 @@ fn rootPath() []const u8 {
}

// build sokol into a static library
pub fn buildSokol(b: *Builder, target: CrossTarget, optimize: OptimizeMode, config: Config, comptime prefix_path: []const u8) *CompileStep {
pub fn buildSokol(b: *Build, target: CrossTarget, optimize: OptimizeMode, config: Config, comptime prefix_path: []const u8) *CompileStep {
const sharedlib = b.option(bool, "Shared", "Build sokol dynamic library [default: static]") orelse false;
const lib = if (sharedlib) b.addSharedLibrary(.{
.name = "sokol",
Expand Down Expand Up @@ -172,7 +172,7 @@ pub fn buildSokol(b: *Builder, target: CrossTarget, optimize: OptimizeMode, conf
return lib;
}

pub fn build(b: *Builder) !void {
pub fn build(b: *Build) !void {
var config: Config = .{};

const force_gl = b.option(bool, "gl", "Force GL backend") orelse false;
Expand Down Expand Up @@ -236,7 +236,9 @@ pub fn build(b: *Builder) !void {
"-preview=all",
},
// fixme: https://github.com/kassane/sokol-d/issues/1 - betterC works on darwin
.zig_cc = enable_zigcc,
.zig_cc = if (target.result.isDarwin() and !enable_betterC) false else enable_zigcc,
.target = target,
.optimize = optimize,
});
ldc.setName(example);
b.getInstallStep().dependOn(&ldc.step);
Expand All @@ -249,7 +251,7 @@ pub fn build(b: *Builder) !void {
}

// a separate step to compile shaders, expects the shader compiler in ../sokol-tools-bin/
fn buildShaders(b: *Builder) void {
fn buildShaders(b: *Build) void {
const sokol_tools_bin_dir = "../sokol-tools-bin/bin/";
const shaders_dir = "src/shaders/";
const shaders = .{
Expand Down Expand Up @@ -293,7 +295,7 @@ fn buildShaders(b: *Builder) void {
}

// Use LDC2 (https://github.com/ldc-developers/ldc) to compile the D examples
fn buildLDC(b: *Builder, lib: *CompileStep, config: ldcConfig) !*RunStep {
fn buildLDC(b: *Build, lib: *CompileStep, config: ldcConfig) !*RunStep {
// ldmd2: ldc2 wrapped w/ dmd flags
const ldc = try b.findProgram(&.{"ldmd2"}, &.{});

Expand All @@ -304,8 +306,8 @@ fn buildLDC(b: *Builder, lib: *CompileStep, config: ldcConfig) !*RunStep {
try cmds.append(ldc);

if (config.zig_cc) {
try cmds.append(b.fmt("--gcc={s}", .{b.pathJoin(&.{ b.install_prefix, "bin", if (lib.rootModuleTarget().os.tag == .windows) "zcc.exe" else "zcc" })}));
try cmds.append(b.fmt("--linker={s}", .{b.pathJoin(&.{ b.install_prefix, "bin", if (lib.rootModuleTarget().os.tag == .windows) "zcc.exe" else "zcc" })}));
try cmds.append(b.fmt("--gcc={s}", .{b.pathJoin(&.{ b.install_prefix, "bin", if (config.target.result.os.tag == .windows) "zcc.exe" else "zcc" })}));
try cmds.append(b.fmt("--linker={s}", .{b.pathJoin(&.{ b.install_prefix, "bin", if (config.target.result.os.tag == .windows) "zcc.exe" else "zcc" })}));
}

// set kind of build
Expand All @@ -322,10 +324,13 @@ fn buildLDC(b: *Builder, lib: *CompileStep, config: ldcConfig) !*RunStep {
if (config.kind == .lib) {
if (config.linkage == .dynamic) {
try cmds.append("-shared");
try cmds.append("-fvisibility=public");
try cmds.append("--dllimport=all");
if (config.target.result.os.tag == .windows) {
try cmds.append("-fvisibility=public");
try cmds.append("--dllimport=all");
}
}
try cmds.append("--dllimport=defaultLibsOnly");
if (config.target.result.os.tag == .windows)
try cmds.append("--dllimport=defaultLibsOnly");
try cmds.append("-fvisibility=hidden");
}

Expand All @@ -336,11 +341,11 @@ fn buildLDC(b: *Builder, lib: *CompileStep, config: ldcConfig) !*RunStep {
// betterC disable druntime and phobos
if (config.betterC)
try cmds.append("--betterC")
else if (lib.linkage == .dynamic or lib.rootModuleTarget().isDarwin())
else if (lib.linkage == .dynamic)
// linking the druntime/Phobos as dynamic libraries
try cmds.append("-link-defaultlib-shared");

switch (lib.root_module.optimize.?) {
switch (config.optimize) {
.Debug => {
try cmds.append("-d-debug");
try cmds.append("--gc"); // debuginfo for non D dbg
Expand Down Expand Up @@ -431,15 +436,15 @@ fn buildLDC(b: *Builder, lib: *CompileStep, config: ldcConfig) !*RunStep {

// link flags
// GNU LD
if (lib.rootModuleTarget().os.tag == .linux and !config.zig_cc)
if (config.target.result.os.tag == .linux and !config.zig_cc)
try cmds.append("-L--no-as-needed");
// LLD (not working in zld)
if (lib.rootModuleTarget().isDarwin() and !config.zig_cc)
if (config.target.result.isDarwin() and !config.zig_cc)
// https://github.com/ldc-developers/ldc/issues/4501
try cmds.append("-L-w"); // resolve linker warnings

// Darwin frameworks
if (lib.rootModuleTarget().isDarwin()) {
if (config.target.result.isDarwin()) {
var it = lib.root_module.frameworks.iterator();
while (it.next()) |framework| {
try cmds.append(b.fmt("-L-framework", .{}));
Expand Down Expand Up @@ -474,15 +479,15 @@ fn buildLDC(b: *Builder, lib: *CompileStep, config: ldcConfig) !*RunStep {
if (enabled) try cmds.append("--flto=full");

// ldc2 doesn't support zig native (a.k.a: native-native or native)
if (lib.rootModuleTarget().isDarwin())
try cmds.append(b.fmt("--mtriple={s}-apple-{s}", .{ if (lib.rootModuleTarget().cpu.arch.isAARCH64()) "arm64" else @tagName(lib.rootModuleTarget().cpu.arch), @tagName(lib.rootModuleTarget().os.tag) }))
else if (lib.rootModuleTarget().isWasm())
try cmds.append(b.fmt("--mtriple={s}-unknown-unknown-{s}", .{ @tagName(lib.rootModuleTarget().cpu.arch), @tagName(lib.rootModuleTarget().os.tag) }))
if (config.target.result.isDarwin())
try cmds.append(b.fmt("--mtriple={s}-apple-{s}", .{ if (config.target.result.cpu.arch.isAARCH64()) "arm64" else @tagName(config.target.result.cpu.arch), @tagName(config.target.result.os.tag) }))
else if (config.target.result.isWasm())
try cmds.append(b.fmt("--mtriple={s}-unknown-unknown-{s}", .{ @tagName(config.target.result.cpu.arch), @tagName(config.target.result.os.tag) }))
else
try cmds.append(b.fmt("--mtriple={s}-{s}-{s}", .{ @tagName(lib.rootModuleTarget().cpu.arch), @tagName(lib.rootModuleTarget().os.tag), @tagName(lib.rootModuleTarget().abi) }));
try cmds.append(b.fmt("--mtriple={s}-{s}-{s}", .{ @tagName(config.target.result.cpu.arch), @tagName(config.target.result.os.tag), @tagName(config.target.result.abi) }));

// cpu model (e.g. "baseline")
// try cmds.append(b.fmt("--mcpu={s}", .{lib.rootModuleTarget().cpu.model.name}));
// try cmds.append(b.fmt("--mcpu={s}", .{config.target.result.cpu.model.name}));

// output file
try cmds.append(b.fmt("--of={s}", .{b.pathJoin(&.{ b.install_prefix, "bin", config.name orelse "d_binary" })}));
Expand All @@ -493,7 +498,7 @@ fn buildLDC(b: *Builder, lib: *CompileStep, config: ldcConfig) !*RunStep {
return ldc_exec;
}

fn buildZigCC(b: *Builder) void {
fn buildZigCC(b: *Build) void {
const exe = b.addExecutable(.{
.name = "zcc",
.target = b.host, // native (host)
Expand All @@ -506,11 +511,20 @@ fn buildZigCC(b: *Builder) void {
}

const ldcConfig = struct {
target: Build.ResolvedTarget,
optimize: std.builtin.OptimizeMode = .Debug,
kind: CompileStep.Kind = .exe,
linkage: CompileStep.Linkage = .static,
betterC: bool = false,
sources: []const []const u8 = std.mem.zeroes([]const []const u8),
dflags: []const []const u8 = std.mem.zeroes([]const []const u8),
name: ?[]const u8 = null,
zig_cc: bool = false,
package: ?*Build.Dependency = null,

fn packagePath(self: ldcConfig, b: *Build) ?[]const u8 {
if (self.package) |dep|
return dep.path("").getPath(b);
return null;
}
};
13 changes: 13 additions & 0 deletions build.zig.zon
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.{
.name = "sokol-d",
.version = "0.1.0",
.dependencies = .{
// TODO
// .@"bindbc-imgui" = .{
// .url = "git+https://github.com/BindBC/bindbc-imgui#63cf88e1ab3981794d2e17d2c4a30d1ac340b148",
// .hash = "1220194ac6476adaed11b30299a8abdd593eb7ae6d368bf6832d7fe6a604f12cae4f",
// },
},
.min_zig_version = "0.12.0",
.paths = .{""},
}

0 comments on commit 43d371b

Please sign in to comment.