diff --git a/Makefile b/Makefile index 841abb6c..206c7ecd 100644 --- a/Makefile +++ b/Makefile @@ -329,7 +329,7 @@ clean: -rm -rf build vgcore.* callgrind.* test-install: - cd test/install && jpm --verbose clean && jpm --verbose build && jpm --verbose test \ + cd test/install && rm -rf build .cache .manifests && jpm --verbose build && jpm --verbose test \ && build/testexec build/embed_janet.o: build/janet.c $(JANET_HEADERS) diff --git a/auxlib/cook.janet b/auxlib/cook.janet index 52a854fe..484d235b 100644 --- a/auxlib/cook.janet +++ b/auxlib/cook.janet @@ -304,8 +304,8 @@ (rule target objects (print "linking " target "...") (if is-win - (shell ld ;lflags (string "/OUT:" target) ;objects (if standalone (libjanet) (win-import-library))) - (shell ld ;cflags `-o` target ;objects ;lflags ;(if standalone [(libjanet)] []))))) + (shell ld ;lflags (string "/OUT:" target) (if standalone (libjanet) (win-import-library)) ;objects) + (shell ld ;cflags `-o` target ;objects ;(if standalone [(libjanet)] []) ;lflags)))) (defn- archive-c "Link object files together to make a static library." diff --git a/tools/amalg.janet b/tools/amalg.janet index de5f4392..c571a7e6 100644 --- a/tools/amalg.janet +++ b/tools/amalg.janet @@ -8,5 +8,5 @@ (print ```#include "janet.h"```) # Body -(each path (tuple/slice process/args 2) +(each path (tuple/slice (dyn :args) 1) (print (slurp path)))