summaryrefslogtreecommitdiff
path: root/mbld
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2018-01-16 10:08:08 -0800
committerOri Bernstein <ori@eigenstate.org>2018-01-16 10:08:08 -0800
commitf698f29852c65149698e6018f2c5d312cf9b2812 (patch)
treeb2e2a93952d29cfce5dbbf59ac76d5dc8a118d5a /mbld
parent012c761ef5952366fe4c9be95ad8aa250afe6154 (diff)
parent4db2895318842a451a5036652ea9373667a603b1 (diff)
downloadmc-f698f29852c65149698e6018f2c5d312cf9b2812.tar.gz
Merge branch 'clink-obsd' of https://github.com/moreais/mc
Diffstat (limited to 'mbld')
-rw-r--r--mbld/config+plan9-x64.myr1
-rw-r--r--mbld/deps.myr11
2 files changed, 8 insertions, 4 deletions
diff --git a/mbld/config+plan9-x64.myr b/mbld/config+plan9-x64.myr
index b13fedc..e246d4d 100644
--- a/mbld/config+plan9-x64.myr
+++ b/mbld/config+plan9-x64.myr
@@ -4,6 +4,7 @@ pkg config =
const Sys = "Plan9"
const Objsuffix = ".6"
const Linkcmd = ["6l", "-l"]
+ const Dlflags : byte[:][:] = [][:]
const Arcmd = ["ar", "u"]
const Ascmd = ["6a"]
const Directlib = true
diff --git a/mbld/deps.myr b/mbld/deps.myr
index c312f5c..cae46b1 100644
--- a/mbld/deps.myr
+++ b/mbld/deps.myr
@@ -453,18 +453,21 @@ const linkcmd = {b, n, mt, bin, libs, dynlibs, istest
std.slpush(&n.cmd, std.sldup(o))
;;
- dynlink = addlibs(b, &n.cmd, libs, mt.incpath)
+ dynlink = addlibs(b, &n.cmd, libs, mt.incpath) || mt.isdyn
for l : dynlibs
std.slpush(&n.cmd, std.fmt("-l{}", l))
;;
+ if dynlink
+ for f : config.Dlflags
+ std.slpush(&n.cmd, std.sldup(f))
+ ;;
+ ;;
+
/* OSX warns if we don't add a version */
if std.sleq(opt_sys, "osx")
std.slpush(&n.cmd, std.sldup("-macosx_version_min"))
std.slpush(&n.cmd, std.sldup("10.6"))
- elif std.sleq(opt_sys, "linux") && (dynlink || mt.isdyn)
- std.slpush(&n.cmd, std.sldup("-dynamic-linker"))
- std.slpush(&n.cmd, std.sldup("/lib64/ld-linux-x86-64.so.2"))
;;
}