ref: f04c9a908e796e5356e961d84158dfe6b1c25d7a
parent: adbf59398978f304071df1e933e0e01a9d6027b7
author: Ori Bernstein <[email protected]>
date: Mon Jul 2 17:23:55 EDT 2018
Respect {noinst} attribute.
--- a/lib/http/bld.sub
+++ b/lib/http/bld.sub
@@ -1,23 +1,3 @@
-bin h {noinst}=- h.myr
-
- lib http
- lib ../sys:sys
- lib ../std:std
- lib ../bio:bio
- lib ../thread:thread
-;;
-
-bin srvdot {noinst}=- srvdot.myr
-
- lib http
- lib ../sys:sys
- lib ../std:std
- lib ../bio:bio
- lib ../thread:thread
-;;
-
lib http =
parse.myr
types.myr
--- a/mbld/deps.myr
+++ b/mbld/deps.myr
@@ -71,8 +71,10 @@
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 @@
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 @@
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)