diff --git a/build/definitions.mk b/build/definitions.mk index 3feec394a..796e0590d 100644 --- a/build/definitions.mk +++ b/build/definitions.mk @@ -87,7 +87,6 @@ IGNORE := $(shell $(MKDIR) $(TMPDIR)) ifneq ($(findstring aarch64,$(MODE)),) ARCH = aarch64 -VM = o/third_party/qemu/qemu-aarch64 HOSTS ?= pi silicon else ARCH = x86_64 diff --git a/build/rules.mk b/build/rules.mk index 8deb0b986..4025aece8 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -103,17 +103,17 @@ o/$(MODE)/%.pkg: $(file >$(TMPSAFE).args,$(filter %.o,$^)) @$(COMPILE) -APACKAGE -wT$@ $(PKG) $(OUTPUT_OPTION) $(addprefix -d,$(filter %.pkg,$^)) @$(TMPSAFE).args -o/$(MODE)/%.o: %.py o/$(MODE)/third_party/python/pyobj.com $(VM) - @$(COMPILE) -wAPYOBJ $(VM) o/$(MODE)/third_party/python/pyobj.com $(PYFLAGS) -o $@ $< +o/$(MODE)/%.o: %.py o/$(MODE)/third_party/python/pyobj.com + @$(COMPILE) -wAPYOBJ o/$(MODE)/third_party/python/pyobj.com $(PYFLAGS) -o $@ $< -o/$(MODE)/%.pyc: %.py o/$(MODE)/third_party/python/pycomp.com $(VM) - @$(COMPILE) -wAPYCOMP $(VM) o/$(MODE)/third_party/python/pycomp.com $(PYCFLAGS) -o $@ $< +o/$(MODE)/%.pyc: %.py o/$(MODE)/third_party/python/pycomp.com + @$(COMPILE) -wAPYCOMP o/$(MODE)/third_party/python/pycomp.com $(PYCFLAGS) -o $@ $< -o/$(MODE)/%.lua: %.lua o/$(MODE)/third_party/lua/luac.com $(VM) - @$(COMPILE) -wALUAC $(VM) o/$(MODE)/third_party/lua/luac.com -s -o $@ $< +o/$(MODE)/%.lua: %.lua o/$(MODE)/third_party/lua/luac.com + @$(COMPILE) -wALUAC o/$(MODE)/third_party/lua/luac.com -s -o $@ $< -o/$(MODE)/%.lua.runs: %.lua o/$(MODE)/tool/net/redbean.com $(VM) - @$(COMPILE) -wALUA -tT$@ $(VM) o/$(MODE)/tool/net/redbean.com $(LUAFLAGS) -i $< +o/$(MODE)/%.lua.runs: %.lua o/$(MODE)/tool/net/redbean.com + @$(COMPILE) -wALUA -tT$@ o/$(MODE)/tool/net/redbean.com $(LUAFLAGS) -i $< ################################################################################ # LOCAL UNIT TESTS @@ -153,8 +153,8 @@ o/$(MODE)/%.lua.runs: %.lua o/$(MODE)/tool/net/redbean.com $(VM) # then the stdout/stderr output, which would normally be suppressed, # will actually be displayed. -o/$(MODE)/%.runs: o/$(MODE)/% $(VM) - @$(COMPILE) -ACHECK -wtT$@ $(VM) $< $(TESTARGS) +o/$(MODE)/%.runs: o/$(MODE)/% + @$(COMPILE) -ACHECK -wtT$@ $< $(TESTARGS) ################################################################################ # ELF ZIP FILES @@ -212,14 +212,12 @@ o/$(MODE)/%.okk: % MAKE_SYMTAB_CREATE = \ $(COMPILE) -wASYMTAB \ - $(VM) \ o/$(MODE)/tool/build/symtab.com \ -o $(TMPSAFE)/.symtab \ $< MAKE_SYMTAB_ZIP = \ $(COMPILE) -AZIP -T$@ \ - $(VM) \ o/$(MODE)/third_party/zip/zip.com \ -b$(TMPDIR) \ -9qj \ diff --git a/examples/examples.mk b/examples/examples.mk index 9e5284b26..41d2cbc28 100644 --- a/examples/examples.mk +++ b/examples/examples.mk @@ -160,8 +160,7 @@ o/$(MODE)/examples/nesemu1.com.dbg: \ o/$(MODE)/examples/symtab.com: \ o/$(MODE)/examples/symtab.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/net/turfwar/turfwar.mk b/net/turfwar/turfwar.mk index 36f09b426..b207c0263 100644 --- a/net/turfwar/turfwar.mk +++ b/net/turfwar/turfwar.mk @@ -70,8 +70,7 @@ o/$(MODE)/net/turfwar/turfbean.com.dbg: \ o/$(MODE)/net/turfwar/turfbean.com: \ o/$(MODE)/net/turfwar/turfbean.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/test/libc/mem/test.mk b/test/libc/mem/test.mk index 07e5a3e58..974c734e5 100644 --- a/test/libc/mem/test.mk +++ b/test/libc/mem/test.mk @@ -82,14 +82,12 @@ o/$(MODE)/test/libc/mem/prog/life.com.dbg: \ o/$(MODE)/test/libc/mem/prog/life.elf: \ o/$(MODE)/tool/build/assimilate.com \ - o/$(MODE)/test/libc/mem/prog/life.com \ - $(VM) + o/$(MODE)/test/libc/mem/prog/life.com @$(COMPILE) -wACP -T$@ \ build/bootstrap/cp.com \ o/$(MODE)/test/libc/mem/prog/life.com \ o/$(MODE)/test/libc/mem/prog/life.elf @$(COMPILE) -wAASSIMILATE -T$@ \ - $(VM) \ o/$(MODE)/tool/build/assimilate.com -bcef \ o/$(MODE)/test/libc/mem/prog/life.elf @@ -115,14 +113,12 @@ o/$(MODE)/test/libc/mem/prog/sock.com.dbg: \ o/$(MODE)/test/libc/mem/prog/sock.elf: \ o/$(MODE)/tool/build/assimilate.com \ - o/$(MODE)/test/libc/mem/prog/sock.com \ - $(VM) + o/$(MODE)/test/libc/mem/prog/sock.com @$(COMPILE) -wACP -T$@ \ build/bootstrap/cp.com \ o/$(MODE)/test/libc/mem/prog/sock.com \ o/$(MODE)/test/libc/mem/prog/sock.elf @$(COMPILE) -wAASSIMILATE -T$@ \ - $(VM) \ o/$(MODE)/tool/build/assimilate.com -cef \ o/$(MODE)/test/libc/mem/prog/sock.elf diff --git a/test/tool/net/test.mk b/test/tool/net/test.mk index b1c565f9e..43c97a8ad 100644 --- a/test/tool/net/test.mk +++ b/test/tool/net/test.mk @@ -83,8 +83,7 @@ o/$(MODE)/test/tool/net/redbean-tester.com: \ o/$(MODE)/test/tool/net/redbean-tester.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ o/$(MODE)/tool/build/symtab.com \ - $(TOOL_NET_REDBEAN_STANDARD_ASSETS) \ - $(VM) + $(TOOL_NET_REDBEAN_STANDARD_ASSETS) @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/third_party/make/make.mk b/third_party/make/make.mk index f166f44c4..8b22bba37 100644 --- a/third_party/make/make.mk +++ b/third_party/make/make.mk @@ -153,8 +153,7 @@ o/$(MODE)/third_party/make/make.com.dbg: \ o/$(MODE)/third_party/make/make.com: \ o/$(MODE)/third_party/make/make.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/third_party/mbedtls/test/test.mk b/third_party/mbedtls/test/test.mk index 0919c371a..670d08ca5 100644 --- a/third_party/mbedtls/test/test.mk +++ b/third_party/mbedtls/test/test.mk @@ -130,8 +130,8 @@ o/$(MODE)/third_party/mbedtls/test/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/third_party/mbedtls/test/%.com.runs: o/$(MODE)/third_party/mbedtls/test/%.com $(VM) - @$(COMPILE) -ACHECK -wtT$@ $(VM) $< $(TESTARGS) +o/$(MODE)/third_party/mbedtls/test/%.com.runs: o/$(MODE)/third_party/mbedtls/test/%.com + @$(COMPILE) -ACHECK -wtT$@ $< $(TESTARGS) o/$(MODE)/third_party/mbedtls/test/lib.o: private \ CFLAGS += \ diff --git a/third_party/python/python.mk b/third_party/python/python.mk index e6fb18b6b..32c94a956 100644 --- a/third_party/python/python.mk +++ b/third_party/python/python.mk @@ -478,13 +478,11 @@ THIRD_PARTY_PYTHON_STAGE1_A_DEPS = \ $(call uniq,$(foreach x,$(THIRD_PARTY_PYTHON_STAGE1_A_DIRECTDEPS),$($(x)))) o//third_party/python/Python/importlib.inc: \ - $(VM) \ o/$(MODE)/third_party/python/freeze.com \ third_party/python/Lib/importlib/_bootstrap.py @$(COMPILE) -AFREEZE -wT$@ $^ $@ o//third_party/python/Python/importlib_external.inc: \ - $(VM) \ o/$(MODE)/third_party/python/freeze.com \ third_party/python/Lib/importlib/_bootstrap_external.py @$(COMPILE) -AFREEZE -wT$@ $^ $@ @@ -2154,7 +2152,7 @@ o/$(MODE)/third_party/python/Lib/test/test_signal.py.runs: \ o/$(MODE)/third_party/python/Lib/test/test_timeout.py.runs: \ private .PLEDGE = stdio rpath wpath cpath fattr proc inet -PYTHONTESTER = $(VM) o/$(MODE)/third_party/python/pythontester.com +PYTHONTESTER = o/$(MODE)/third_party/python/pythontester.com o/$(MODE)/third_party/python/Lib/test/test_grammar.py.runs: $(PYTHONTESTER) $(COMPILE) -ACHECK -wtT$@ $(PYHARNESSARGS) $(PYTHONTESTER) -m test.test_grammar $(PYTESTARGS) @@ -4024,8 +4022,7 @@ o/$(MODE)/third_party/python/python.com.dbg: \ o/$(MODE)/third_party/python/python.com: \ o/$(MODE)/third_party/python/python.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/third_party/quickjs/quickjs.mk b/third_party/quickjs/quickjs.mk index 0df3c8a84..76f489606 100644 --- a/third_party/quickjs/quickjs.mk +++ b/third_party/quickjs/quickjs.mk @@ -137,15 +137,13 @@ THIRD_PARTY_QUICKJS_CHECKS = \ o/$(MODE)/third_party/quickjs/qjscalc.c: \ third_party/quickjs/qjscalc.js \ - o/$(MODE)/third_party/quickjs/qjsc.com \ - $(VM) - @$(COMPILE) -wAQJSC $(VM) o/$(MODE)/third_party/quickjs/qjsc.com -fbignum -o $@ -c $< + o/$(MODE)/third_party/quickjs/qjsc.com + @$(COMPILE) -wAQJSC o/$(MODE)/third_party/quickjs/qjsc.com -fbignum -o $@ -c $< o/$(MODE)/third_party/quickjs/repl.c: \ third_party/quickjs/repl.js \ - o/$(MODE)/third_party/quickjs/qjsc.com \ - $(VM) - @$(COMPILE) -wAQJSC $(VM) o/$(MODE)/third_party/quickjs/qjsc.com -o $@ -m -c $< + o/$(MODE)/third_party/quickjs/qjsc.com + @$(COMPILE) -wAQJSC o/$(MODE)/third_party/quickjs/qjsc.com -o $@ -m -c $< o/$(MODE)/third_party/quickjs/qjs.com.dbg: \ $(THIRD_PARTY_QUICKJS) \ @@ -159,8 +157,7 @@ o/$(MODE)/third_party/quickjs/qjs.com.dbg: \ o/$(MODE)/third_party/quickjs/qjs.com: \ o/$(MODE)/third_party/quickjs/qjs.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/third_party/sqlite3/sqlite3.mk b/third_party/sqlite3/sqlite3.mk index f882e9826..ed9b90e51 100644 --- a/third_party/sqlite3/sqlite3.mk +++ b/third_party/sqlite3/sqlite3.mk @@ -78,8 +78,7 @@ o/$(MODE)/third_party/sqlite3/sqlite3.com.dbg: \ o/$(MODE)/third_party/sqlite3/sqlite3.com: \ o/$(MODE)/third_party/sqlite3/sqlite3.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/third_party/tidy/tidy.mk b/third_party/tidy/tidy.mk index be02bf258..46c89b1b9 100644 --- a/third_party/tidy/tidy.mk +++ b/third_party/tidy/tidy.mk @@ -55,8 +55,7 @@ o/$(MODE)/third_party/tidy/tidy.com.dbg: \ o/$(MODE)/third_party/tidy/tidy.com: \ o/$(MODE)/third_party/tidy/tidy.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/tool/net/net.mk b/tool/net/net.mk index 848f6a076..1a89ecb1d 100644 --- a/tool/net/net.mk +++ b/tool/net/net.mk @@ -113,8 +113,7 @@ o/$(MODE)/tool/net/redbean.com.dbg: \ o/$(MODE)/tool/net/redbean.com: \ o/$(MODE)/tool/net/redbean.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) @@ -225,8 +224,7 @@ o/$(MODE)/tool/net/redbean-demo.com.dbg: \ o/$(MODE)/tool/net/redbean-demo.com: \ o/$(MODE)/tool/net/redbean-demo.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) @@ -252,8 +250,7 @@ o/$(MODE)/tool/net/redbean-static.com.dbg: \ o/$(MODE)/tool/net/redbean-static.com: \ o/$(MODE)/tool/net/redbean-static.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) @@ -280,8 +277,7 @@ o/$(MODE)/tool/net/redbean-unsecure.com.dbg: \ o/$(MODE)/tool/net/redbean-unsecure.com: \ o/$(MODE)/tool/net/redbean-unsecure.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) @@ -308,8 +304,7 @@ o/$(MODE)/tool/net/redbean-original.com.dbg: \ o/$(MODE)/tool/net/redbean-original.com: \ o/$(MODE)/tool/net/redbean-original.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) diff --git a/tool/viz/viz.mk b/tool/viz/viz.mk index 842874131..7a7d72c28 100644 --- a/tool/viz/viz.mk +++ b/tool/viz/viz.mk @@ -80,8 +80,7 @@ o/$(MODE)/tool/viz/printimage.com.dbg: \ o/$(MODE)/tool/viz/printimage.com: \ o/$(MODE)/tool/viz/printimage.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP) @@ -89,8 +88,7 @@ o/$(MODE)/tool/viz/printimage.com: \ o/$(MODE)/tool/viz/printvideo.com: \ o/$(MODE)/tool/viz/printvideo.com.dbg \ o/$(MODE)/third_party/zip/zip.com \ - o/$(MODE)/tool/build/symtab.com \ - $(VM) + o/$(MODE)/tool/build/symtab.com @$(MAKE_OBJCOPY) @$(MAKE_SYMTAB_CREATE) @$(MAKE_SYMTAB_ZIP)