summaryrefslogtreecommitdiff
path: root/mbld
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2018-07-02 21:23:55 -0700
committerOri Bernstein <ori@eigenstate.org>2018-07-03 21:27:11 -0700
commitf04c9a908e796e5356e961d84158dfe6b1c25d7a (patch)
tree1fa6fe086073ff6fd3bfc47f6aaceff28ab12ba6 /mbld
parentadbf59398978f304071df1e933e0e01a9d6027b7 (diff)
downloadmc-f04c9a908e796e5356e961d84158dfe6b1c25d7a.tar.gz
Respect {noinst} attribute.
Diffstat (limited to 'mbld')
-rw-r--r--mbld/deps.myr15
1 files changed, 9 insertions, 6 deletions
diff --git a/mbld/deps.myr b/mbld/deps.myr
index b2ad492..ec5c09e 100644
--- a/mbld/deps.myr
+++ b/mbld/deps.myr
@@ -71,8 +71,10 @@ const myrdeps = {b, name, mt
gu = node(g, tu)
go = node(g, to)
- go.instdir = config.Libpath
- gu.instdir = config.Libpath
+ if mt.install
+ go.instdir = config.Libpath
+ gu.instdir = config.Libpath
+ ;;
go.instmod = 0o644
gu.instmod = 0o644
generates(g, gu, tu)
@@ -112,8 +114,10 @@ const myrdeps = {b, name, mt
std.slpush(&n.cmd, std.pathjoin([b.basedir, opt_objdir, mt.dir, mt.name][:]))
else
addnode(g, "all", go)
- go.instdir = config.Binpath
- go.instmod = 0o755
+ if mt.install
+ go.instdir = config.Binpath
+ go.instmod = 0o755
+ ;;
;;
std.slfree(u)
;;
@@ -261,10 +265,9 @@ const datdeps = {b, name, dt
for db : dt.blobs
p = std.pathcat(dt.dir, db)
n = leaf(b.deps, p)
+ n.instdir = dt.path
if dt.path.len == 0
n.instdir = config.Sharepath
- else
- n.instdir = dt.path
;;
n.instmod = 0o644
addnode(b.deps, "all", n)