aboutsummaryrefslogtreecommitdiff
path: root/lib/std
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-11-30 18:11:07 -0700
committerAndrew Kelley <andrew@ziglang.org>2020-11-30 18:12:00 -0700
commit9d1816111d1d30e18b8cb43a4aa31c194fb204c4 (patch)
tree573ce3827a015f7a349f7e333fda0580d2e0ea6e /lib/std
parentf7d0a32045858be4eaba4b85d00e1bf3edbff43a (diff)
downloadzig-9d1816111d1d30e18b8cb43a4aa31c194fb204c4.tar.gz
zig-9d1816111d1d30e18b8cb43a4aa31c194fb204c4.zip
build system: pass dyn lib artifacts as positionals
Diffstat (limited to 'lib/std')
-rw-r--r--lib/std/build.zig9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/std/build.zig b/lib/std/build.zig
index c8439ca20a..a658e1f057 100644
--- a/lib/std/build.zig
+++ b/lib/std/build.zig
@@ -1980,13 +1980,10 @@ pub const LibExeObjStep = struct {
try zig_args.append(other.getOutputPath());
},
.Lib => {
- if (!other.is_dynamic or self.target.isWindows()) {
- try zig_args.append(other.getOutputLibPath());
- } else {
- const full_path_lib = other.getOutputPath();
- try zig_args.append("--library");
- try zig_args.append(full_path_lib);
+ const full_path_lib = other.getOutputPath();
+ try zig_args.append(full_path_lib);
+ if (other.is_dynamic and !self.target.isWindows()) {
if (fs.path.dirname(full_path_lib)) |dirname| {
try zig_args.append("-rpath");
try zig_args.append(dirname);