Merge branch 'vendor/BMAKE'
authorJohn Marino <draco@marino.st>
Mon, 29 Aug 2016 13:21:47 +0000 (08:21 -0500)
committerJohn Marino <draco@marino.st>
Mon, 29 Aug 2016 13:21:47 +0000 (08:21 -0500)
1  2 
contrib/bmake/job.c
contrib/bmake/main.c
contrib/bmake/var.c

Simple merge
Simple merge
@@@ -541,9 -555,9 +555,9 @@@ Var_Delete(const char *name, GNode *ctx
      char *cp;
      
      if (strchr(name, '$')) {
-       cp = Var_Subst(NULL, name, VAR_GLOBAL, 0);
+       cp = Var_Subst(NULL, name, VAR_GLOBAL, VARF_WANTRES);
      } else {
 -      cp = (char *)name;
 +      cp = __DECONST(char *,name); /* XXX */
      }
      ln = Hash_FindEntry(&ctxt->context, cp);
      if (DEBUG(VAR)) {