summaryrefslogtreecommitdiff
path: root/mbld
diff options
context:
space:
mode:
authorCarlin Bingham <cb@viennan.net>2018-01-13 08:27:34 +1300
committerCarlin Bingham <cb@viennan.net>2018-01-13 08:27:34 +1300
commit8355d0e6cd741731b972955dd10dfb494c3370bf (patch)
tree98a8750e969e66983172215e29efafbe79f37758 /mbld
parent0f623b59194288d612412d6db7fb0db4ebb5321d (diff)
downloadmc-8355d0e6cd741731b972955dd10dfb494c3370bf.tar.gz
Put the isdyn flag back in the myrtag
Diffstat (limited to 'mbld')
-rw-r--r--mbld/deps.myr3
-rw-r--r--mbld/parse.myr1
-rw-r--r--mbld/types.myr1
3 files changed, 4 insertions, 1 deletions
diff --git a/mbld/deps.myr b/mbld/deps.myr
index 49f3aa6..14fd263 100644
--- a/mbld/deps.myr
+++ b/mbld/deps.myr
@@ -177,6 +177,7 @@ const myrdeps = {b, name, mt
for l : ll
std.slpush(&dynlibs, l)
;;
+ mt.isdyn = true
elif std.hassuffix(f, config.Objsuffix)
depends(g, go, p)
else
@@ -463,7 +464,7 @@ const linkcmd = {b, n, mt, bin, libs, dynlibs, istest
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
+ 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"))
;;
diff --git a/mbld/parse.myr b/mbld/parse.myr
index 5f82c05..fa1c095 100644
--- a/mbld/parse.myr
+++ b/mbld/parse.myr
@@ -472,6 +472,7 @@ const myrtarget = {b, p, targ
.islib=false,
.istest=istest,
.isbench=isbench,
+ .isdyn=false,
/* attrs */
.tags=tags,
.install=install,
diff --git a/mbld/types.myr b/mbld/types.myr
index 0d671e6..e170b00 100644
--- a/mbld/types.myr
+++ b/mbld/types.myr
@@ -46,6 +46,7 @@ pkg bld =
islib : bool
istest : bool
isbench : bool
+ isdyn : bool
install : bool
;;