From 7b993d561c1baee412e17bb34364462a9835aee9 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Wed, 10 Aug 2022 18:00:45 -0700 Subject: [PATCH] Use private keyword on makefile target variables --- dsp/bmp/bmp.mk | 4 +- dsp/core/core.mk | 6 +- dsp/mpeg/mpeg.mk | 5 +- dsp/scale/scale.mk | 2 +- dsp/tty/tty.mk | 4 +- examples/examples.mk | 8 +- libc/alg/alg.mk | 2 +- libc/calls/calls.mk | 30 ++-- libc/fmt/fmt.mk | 8 +- libc/intrin/intrin.mk | 20 +-- libc/log/log.mk | 6 +- libc/nexgen32e/nexgen32e.mk | 2 +- libc/rand/rand.mk | 2 +- libc/runtime/runtime.mk | 12 +- libc/stdio/stdio.mk | 4 +- libc/str/str.mk | 18 +- libc/thread/thread.mk | 2 +- libc/time/time.mk | 6 +- libc/tinymath/tinymath.mk | 2 +- net/http/http.mk | 4 +- test/libc/alg/test.mk | 2 +- test/libc/bits/test.mk | 2 +- test/libc/calls/test.mk | 20 +-- test/libc/fmt/test.mk | 2 +- test/libc/intrin/test.mk | 2 +- test/libc/log/test.mk | 11 +- test/libc/mem/test.mk | 14 +- test/libc/nexgen32e/test.mk | 2 +- test/libc/rand/test.mk | 2 +- test/libc/runtime/test.mk | 4 +- test/libc/stdio/test.mk | 2 +- test/libc/str/test.mk | 6 +- test/libc/tinymath/test.mk | 2 +- test/tool/plinko/test.mk | 6 +- third_party/argon2/argon2.mk | 2 +- third_party/bzip2/bzip2.mk | 2 +- third_party/chibicc/chibicc.mk | 2 +- third_party/chibicc/test/test.mk | 2 +- third_party/compiler_rt/compiler_rt.mk | 6 +- third_party/dlmalloc/dlmalloc.mk | 6 +- .../double-conversion/double-conversion.mk | 2 +- third_party/gdtoa/gdtoa.mk | 2 +- third_party/libcxx/libcxx.mk | 4 +- third_party/linenoise/linenoise.mk | 2 +- third_party/lua/lua.mk | 8 +- third_party/lz4cli/lz4cli.mk | 4 +- third_party/make/make.mk | 6 +- third_party/maxmind/maxmind.mk | 2 +- third_party/mbedtls/mbedtls.mk | 12 +- third_party/mbedtls/test/test.mk | 6 +- third_party/python/python.mk | 158 +++++++++--------- third_party/quickjs/quickjs.mk | 12 +- third_party/regex/regex.mk | 2 +- third_party/sqlite3/sqlite3.mk | 22 +-- third_party/stb/stb.mk | 6 +- third_party/tidy/tidy.mk | 3 +- third_party/unzip/unzip.mk | 2 +- third_party/xed/xed.mk | 4 +- third_party/zip/zip.mk | 4 +- third_party/zlib/gz/gz.mk | 2 +- third_party/zlib/zlib.mk | 6 +- tool/build/build.mk | 53 +++--- tool/build/emubin/emubin.mk | 2 +- tool/build/lib/buildlib.mk | 13 +- tool/decode/lib/decodelib.mk | 2 +- tool/lambda/lambda.mk | 2 +- tool/net/net.mk | 8 +- tool/plinko/lib/lib.mk | 6 +- tool/plinko/plinko.mk | 10 +- tool/viz/lib/vizlib.mk | 6 +- tool/viz/viz.mk | 4 +- 71 files changed, 305 insertions(+), 314 deletions(-) diff --git a/dsp/bmp/bmp.mk b/dsp/bmp/bmp.mk index c005cc9f9..1f44db1d4 100644 --- a/dsp/bmp/bmp.mk +++ b/dsp/bmp/bmp.mk @@ -40,11 +40,11 @@ $(DSP_BMP_A).pkg: \ $(foreach x,$(DSP_BMP_A_DIRECTDEPS),$($(x)_A).pkg) o/$(MODE)/dsp/bmp/float2short.o \ -o/$(MODE)/dsp/bmp/scalevolume.o: \ +o/$(MODE)/dsp/bmp/scalevolume.o: private \ OVERRIDE_CFLAGS += \ $(MATHEMATICAL) -o/tiny/dsp/bmp/scalevolume.o: \ +o/tiny/dsp/bmp/scalevolume.o: private \ OVERRIDE_CFLAGS += \ -Os diff --git a/dsp/core/core.mk b/dsp/core/core.mk index 66bba02f2..d807c2039 100644 --- a/dsp/core/core.mk +++ b/dsp/core/core.mk @@ -47,15 +47,15 @@ o/$(MODE)/dsp/core/c1331.o \ o/$(MODE)/dsp/core/magikarp.o \ o/$(MODE)/dsp/core/c93654369.o \ o/$(MODE)/dsp/core/float2short.o \ -o/$(MODE)/dsp/core/scalevolume.o: \ +o/$(MODE)/dsp/core/scalevolume.o: private \ OVERRIDE_CFLAGS += \ $(MATHEMATICAL) -o/tiny/dsp/core/scalevolume.o: \ +o/tiny/dsp/core/scalevolume.o: private \ OVERRIDE_CFLAGS += \ -Os -o/$(MODE)/dsp/core/det3.o: \ +o/$(MODE)/dsp/core/det3.o: private \ OVERRIDE_CFLAGS += \ -ffast-math diff --git a/dsp/mpeg/mpeg.mk b/dsp/mpeg/mpeg.mk index 99eb26167..4e4bf4c76 100644 --- a/dsp/mpeg/mpeg.mk +++ b/dsp/mpeg/mpeg.mk @@ -51,13 +51,10 @@ $(DSP_MPEG_A).pkg: \ $(DSP_MPEG_A_OBJS) \ $(foreach x,$(DSP_MPEG_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/dsp/mpeg/clamp4int256-k8.o: \ +o/$(MODE)/dsp/mpeg/clamp4int256-k8.o: private \ OVERRIDE_CFLAGS += \ -Os -#o/$(MODE)/dsp/mpeg/macroblock.o: \ - CC = $(CLANG) - DSP_MPEG_LIBS = $(foreach x,$(DSP_MPEG_ARTIFACTS),$($(x))) DSP_MPEG_SRCS = $(foreach x,$(DSP_MPEG_ARTIFACTS),$($(x)_SRCS)) DSP_MPEG_HDRS = $(foreach x,$(DSP_MPEG_ARTIFACTS),$($(x)_HDRS)) diff --git a/dsp/scale/scale.mk b/dsp/scale/scale.mk index ead96d43a..ede9f5fa0 100644 --- a/dsp/scale/scale.mk +++ b/dsp/scale/scale.mk @@ -51,7 +51,7 @@ $(DSP_SCALE_A).pkg: \ o/$(MODE)/dsp/scale/cdecimate2xuint8x8.o \ o/$(MODE)/dsp/scale/gyarados.o \ o/$(MODE)/dsp/scale/magikarp.o \ -o/$(MODE)/dsp/scale/scale.o: \ +o/$(MODE)/dsp/scale/scale.o: private \ OVERRIDE_CFLAGS += \ $(MATHEMATICAL) diff --git a/dsp/tty/tty.mk b/dsp/tty/tty.mk index 330979712..f25e21fa9 100644 --- a/dsp/tty/tty.mk +++ b/dsp/tty/tty.mk @@ -55,8 +55,8 @@ $(DSP_TTY_A).pkg: \ $(DSP_TTY_A_OBJS) \ $(foreach x,$(DSP_TTY_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/dsp/tty/ttyraster.o: \ - OVERRIDE_CFLAGS += \ +o/$(MODE)/dsp/tty/ttyraster.o: private \ + OVERRIDE_CFLAGS += \ $(MATHEMATICAL) DSP_TTY_LIBS = $(foreach x,$(DSP_TTY_ARTIFACTS),$($(x))) diff --git a/examples/examples.mk b/examples/examples.mk index da7c3f302..e273f4621 100644 --- a/examples/examples.mk +++ b/examples/examples.mk @@ -97,7 +97,7 @@ o/$(MODE)/examples/examples.pkg: \ $(EXAMPLES_OBJS) \ $(foreach x,$(EXAMPLES_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/examples/unbourne.o: \ +o/$(MODE)/examples/unbourne.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED \ -fpie @@ -143,7 +143,7 @@ o/$(MODE)/examples/nesemu1.com.dbg: \ $(EXAMPLES_BOOTLOADER) @$(APELINK) -o/$(MODE)/examples/picol.o: \ +o/$(MODE)/examples/picol.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED @@ -155,8 +155,8 @@ o/$(MODE)/examples/picol.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/examples/nesemu1.o: QUOTA += -M512m -o/$(MODE)/usr/share/dict/words.zip.o: ZIPOBJ_FLAGS += -C2 +o/$(MODE)/examples/nesemu1.o: private QUOTA += -M512m +o/$(MODE)/usr/share/dict/words.zip.o: private ZIPOBJ_FLAGS += -C2 $(EXAMPLES_OBJS): examples/examples.mk diff --git a/libc/alg/alg.mk b/libc/alg/alg.mk index df07ceb29..6ed940acc 100644 --- a/libc/alg/alg.mk +++ b/libc/alg/alg.mk @@ -44,7 +44,7 @@ $(LIBC_ALG_A).pkg: \ $(LIBC_ALG_A_OBJS) \ $(foreach x,$(LIBC_ALG_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/libc/alg/critbit0.o: \ +o/$(MODE)/libc/alg/critbit0.o: private \ DEFAULT_CFLAGS += \ -ffunction-sections \ -fdata-sections diff --git a/libc/calls/calls.mk b/libc/calls/calls.mk index 51363dccb..9ec402428 100644 --- a/libc/calls/calls.mk +++ b/libc/calls/calls.mk @@ -67,14 +67,14 @@ $(LIBC_CALLS_A).pkg: \ # we can't use asan because: # ucontext_t memory is owned by xnu kernel -o/$(MODE)/libc/calls/sigenter-xnu.o: \ +o/$(MODE)/libc/calls/sigenter-xnu.o: private \ OVERRIDE_COPTS += \ -ffreestanding \ -fno-sanitize=address # we can't use asan because: # vdso memory is owned by linux kernel -o/$(MODE)/libc/calls/vdsofunc.greg.o: \ +o/$(MODE)/libc/calls/vdsofunc.greg.o: private \ OVERRIDE_COPTS += \ -ffreestanding \ -fno-sanitize=address @@ -82,7 +82,7 @@ o/$(MODE)/libc/calls/vdsofunc.greg.o: \ # we can't use asan because: # asan guard pages haven't been allocated yet o/$(MODE)/libc/calls/directmap.o \ -o/$(MODE)/libc/calls/directmap-nt.o: \ +o/$(MODE)/libc/calls/directmap-nt.o: private \ OVERRIDE_COPTS += \ -ffreestanding \ -fno-sanitize=address @@ -91,7 +91,7 @@ o/$(MODE)/libc/calls/directmap-nt.o: \ # ntspawn allocates 128kb of heap memory via win32 o/$(MODE)/libc/calls/ntspawn.o \ o/$(MODE)/libc/calls/mkntcmdline.o \ -o/$(MODE)/libc/calls/mkntenvblock.o: \ +o/$(MODE)/libc/calls/mkntenvblock.o: private \ OVERRIDE_COPTS += \ -ffreestanding \ -fno-sanitize=address @@ -99,7 +99,7 @@ o/$(MODE)/libc/calls/mkntenvblock.o: \ # we can't use sanitizers because: # windows owns the data structure o/$(MODE)/libc/calls/wincrash.o \ -o/$(MODE)/libc/calls/ntcontext2linux.o: \ +o/$(MODE)/libc/calls/ntcontext2linux.o: private \ OVERRIDE_COPTS += \ -fno-sanitize=all @@ -109,7 +109,7 @@ o/$(MODE)/libc/calls/sigenter-freebsd.o \ o/$(MODE)/libc/calls/sigenter-netbsd.o \ o/$(MODE)/libc/calls/sigenter-openbsd.o \ o/$(MODE)/libc/calls/sigenter-xnu.o \ -o/$(MODE)/libc/calls/ntcontext2linux.o: \ +o/$(MODE)/libc/calls/ntcontext2linux.o: private \ OVERRIDE_COPTS += \ -O3 @@ -120,7 +120,7 @@ o/$(MODE)/libc/calls/execle.o \ o/$(MODE)/libc/calls/execlp.o \ o/$(MODE)/libc/calls/execve-sysv.o \ o/$(MODE)/libc/calls/execve-nt.greg.o \ -o/$(MODE)/libc/calls/mkntenvblock.o: \ +o/$(MODE)/libc/calls/mkntenvblock.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED @@ -130,21 +130,21 @@ o/$(MODE)/libc/calls/copyfile.o \ o/$(MODE)/libc/calls/symlinkat-nt.o \ o/$(MODE)/libc/calls/readlinkat-nt.o \ o/$(MODE)/libc/calls/linkat-nt.o \ -o/$(MODE)/libc/calls/renameat-nt.o: \ +o/$(MODE)/libc/calls/renameat-nt.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED # we must segregate codegen because: # file contains multiple independently linkable apis o/$(MODE)/libc/calls/ioctl-siocgifconf.o \ -o/$(MODE)/libc/calls/ioctl-siocgifconf-nt.o: \ +o/$(MODE)/libc/calls/ioctl-siocgifconf-nt.o: private \ OVERRIDE_COPTS += \ -ffunction-sections \ -fdata-sections # we want small code size because: # to keep .text.head under 4096 bytes -o/$(MODE)/libc/calls/mman.greg.o: \ +o/$(MODE)/libc/calls/mman.greg.o: private \ OVERRIDE_COPTS += \ -Os @@ -167,7 +167,7 @@ o//libc/calls/ioctl_tiocgwinsz-nt.o \ o//libc/calls/ioctl_tiocgwinsz.o \ o//libc/calls/ioctl_tiocswinsz-nt.o \ o//libc/calls/ioctl_tiocswinsz.o \ -o//libc/calls/fcntl.o: \ +o//libc/calls/fcntl.o: private \ OVERRIDE_CFLAGS += \ -Os @@ -175,7 +175,7 @@ o//libc/calls/fcntl.o: \ # it's early runtime mandatory and quite huge without it o//libc/calls/getcwd.greg.o \ o//libc/calls/getcwd-nt.greg.o \ -o//libc/calls/getcwd-xnu.greg.o: \ +o//libc/calls/getcwd-xnu.greg.o: private \ OVERRIDE_CFLAGS += \ -Os @@ -184,12 +184,12 @@ o//libc/calls/getcwd-xnu.greg.o: \ o/$(MODE)/libc/calls/_timespec_tomillis.o \ o/$(MODE)/libc/calls/_timespec_tomicros.o \ o/$(MODE)/libc/calls/_timespec_frommillis.o \ -o/$(MODE)/libc/calls/_timespec_frommicros.o: \ +o/$(MODE)/libc/calls/_timespec_frommicros.o: private \ OVERRIDE_CFLAGS += \ -O2 o/$(MODE)/libc/calls/pledge-linux.o \ -o/$(MODE)/libc/calls/unveil.o: \ +o/$(MODE)/libc/calls/unveil.o: private \ OVERRIDE_CFLAGS += \ -DSTACK_FRAME_UNLIMITED @@ -197,7 +197,7 @@ o/$(MODE)/libc/calls/unveil.o: \ # it makes a big difference # we need pic because: # so it can be an LD_PRELOAD payload -o/$(MODE)/libc/calls/pledge-linux.o: \ +o/$(MODE)/libc/calls/pledge-linux.o: private \ OVERRIDE_CFLAGS += \ -Os \ -fPIC diff --git a/libc/fmt/fmt.mk b/libc/fmt/fmt.mk index 6ff36f863..10611a401 100644 --- a/libc/fmt/fmt.mk +++ b/libc/fmt/fmt.mk @@ -54,14 +54,14 @@ $(LIBC_FMT_A).pkg: \ $(LIBC_FMT_A_OBJS) \ $(foreach x,$(LIBC_FMT_A_DIRECTDEPS),$($(x)_A).pkg) -$(LIBC_FMT_A_OBJS): \ +$(LIBC_FMT_A_OBJS): private \ OVERRIDE_CFLAGS += \ -fno-jump-tables o/$(MODE)/libc/fmt/formatint64.o \ o/$(MODE)/libc/fmt/formatint64thousands.o \ o/$(MODE)/libc/fmt/dosdatetimetounix.o \ -o/$(MODE)/libc/fmt/itoa64radix10.greg.o: \ +o/$(MODE)/libc/fmt/itoa64radix10.greg.o: private\ OVERRIDE_CFLAGS += \ -O3 @@ -73,7 +73,7 @@ o/$(MODE)/libc/fmt/wcstoul.o \ o/$(MODE)/libc/fmt/strtoimax.o \ o/$(MODE)/libc/fmt/strtoumax.o \ o/$(MODE)/libc/fmt/wcstoimax.o \ -o/$(MODE)/libc/fmt/wcstoumax.o: \ +o/$(MODE)/libc/fmt/wcstoumax.o: private \ OVERRIDE_CFLAGS += \ -Os @@ -81,7 +81,7 @@ o/$(MODE)/libc/fmt/wcstoumax.o: \ # kprintf() depends on these functions o/$(MODE)/libc/fmt/strerrno.greg.o \ o/$(MODE)/libc/fmt/strerrdoc.greg.o \ -o/$(MODE)/libc/fmt/strerror_wr.greg.o: \ +o/$(MODE)/libc/fmt/strerror_wr.greg.o: private \ OVERRIDE_CFLAGS += \ -fpie \ -ffreestanding \ diff --git a/libc/intrin/intrin.mk b/libc/intrin/intrin.mk index f8f0a5392..5e5fa616d 100644 --- a/libc/intrin/intrin.mk +++ b/libc/intrin/intrin.mk @@ -46,12 +46,12 @@ $(LIBC_INTRIN_A).pkg: \ # we can't use asan and ubsan because: # this is asan and ubsan o/$(MODE)/libc/intrin/asan.o \ -o/$(MODE)/libc/intrin/ubsan.o: \ +o/$(MODE)/libc/intrin/ubsan.o: private \ OVERRIDE_CFLAGS += \ -fno-sanitize=all \ -fno-stack-protector -o/$(MODE)/libc/intrin/asan.o: \ +o/$(MODE)/libc/intrin/asan.o: private \ OVERRIDE_CFLAGS += \ -O2 \ -finline \ @@ -63,7 +63,7 @@ o/$(MODE)/libc/intrin/getmagnumstr.greg.o \ o/$(MODE)/libc/intrin/strerrno.greg.o \ o/$(MODE)/libc/intrin/strerrdoc.greg.o \ o/$(MODE)/libc/intrin/strerror_wr.greg.o \ -o/$(MODE)/libc/intrin/kprintf.greg.o: \ +o/$(MODE)/libc/intrin/kprintf.greg.o: private \ OVERRIDE_CFLAGS += \ -fpie \ -fwrapv \ @@ -84,7 +84,7 @@ o/$(MODE)/libc/intrin/pthread_mutex_wake.o \ o/$(MODE)/libc/intrin/pthread_mutex_unlock.o \ o/$(MODE)/libc/intrin/pthread_mutex_trylock.o \ o/$(MODE)/libc/intrin/_trylock_debug_4.o \ -o/$(MODE)/libc/intrin/_spinlock_debug_4.o: \ +o/$(MODE)/libc/intrin/_spinlock_debug_4.o: private \ OVERRIDE_CFLAGS += \ -fwrapv \ -x-no-pg \ @@ -97,7 +97,7 @@ o/$(MODE)/libc/intrin/_spinlock_debug_4.o: \ # we can't use asan because: # global gone could be raised o/$(MODE)/libc/intrin/exit.o \ -o/$(MODE)/libc/intrin/restorewintty.o: \ +o/$(MODE)/libc/intrin/restorewintty.o: private \ OVERRIDE_CFLAGS += \ -fno-sanitize=all @@ -106,7 +106,7 @@ o/$(MODE)/libc/intrin/restorewintty.o: \ o/$(MODE)/libc/intrin/describeflags.o \ o/$(MODE)/libc/intrin/describeframe.o \ o/$(MODE)/libc/intrin/describemapflags.o \ -o/$(MODE)/libc/intrin/describeprotflags.o: \ +o/$(MODE)/libc/intrin/describeprotflags.o: private \ OVERRIDE_CFLAGS += \ -fno-sanitize=address @@ -145,7 +145,7 @@ o/$(MODE)/libc/intrin/createfilemapping.o \ o/$(MODE)/libc/intrin/createfilemappingnuma.o \ o/$(MODE)/libc/intrin/waitformultipleobjects.o \ o/$(MODE)/libc/intrin/generateconsolectrlevent.o \ -o/$(MODE)/libc/intrin/wsawaitformultipleevents.o: \ +o/$(MODE)/libc/intrin/wsawaitformultipleevents.o: private\ OVERRIDE_CFLAGS += \ -Os \ -fwrapv \ @@ -153,20 +153,20 @@ o/$(MODE)/libc/intrin/wsawaitformultipleevents.o: \ -fno-stack-protector \ -fno-sanitize=all -o//libc/intrin/memmove.o: \ +o//libc/intrin/memmove.o: private \ OVERRIDE_CFLAGS += \ -fno-toplevel-reorder o//libc/intrin/bzero.o \ o//libc/intrin/memcmp.o \ o//libc/intrin/memset.o \ -o//libc/intrin/memmove.o: \ +o//libc/intrin/memmove.o: private \ OVERRIDE_CFLAGS += \ -O2 -finline o/$(MODE)/libc/intrin/bzero.o \ o/$(MODE)/libc/intrin/memcmp.o \ -o/$(MODE)/libc/intrin/memmove.o: \ +o/$(MODE)/libc/intrin/memmove.o: private \ OVERRIDE_CFLAGS += \ -fpie diff --git a/libc/log/log.mk b/libc/log/log.mk index 34a3b4338..05b98dc27 100644 --- a/libc/log/log.mk +++ b/libc/log/log.mk @@ -60,11 +60,11 @@ $(LIBC_LOG_A).pkg: \ $(foreach x,$(LIBC_LOG_A_DIRECTDEPS),$($(x)_A).pkg) o/$(MODE)/libc/log/backtrace2.o \ -o/$(MODE)/libc/log/backtrace3.o: \ +o/$(MODE)/libc/log/backtrace3.o: private \ OVERRIDE_CFLAGS += \ -fno-sanitize=all -o/$(MODE)/libc/log/checkfail.o: \ +o/$(MODE)/libc/log/checkfail.o: private \ OVERRIDE_CFLAGS += \ -mgeneral-regs-only @@ -78,7 +78,7 @@ o/$(MODE)/libc/log/onkill.o \ o/$(MODE)/libc/log/startfatal.o \ o/$(MODE)/libc/log/startfatal_ndebug.o \ o/$(MODE)/libc/log/ubsan.o \ -o/$(MODE)/libc/log/die.o: \ +o/$(MODE)/libc/log/die.o: private \ OVERRIDE_CFLAGS += \ $(NO_MAGIC) diff --git a/libc/nexgen32e/nexgen32e.mk b/libc/nexgen32e/nexgen32e.mk index a887887ce..3eba33354 100644 --- a/libc/nexgen32e/nexgen32e.mk +++ b/libc/nexgen32e/nexgen32e.mk @@ -42,7 +42,7 @@ $(LIBC_NEXGEN32E_A).pkg: \ $(LIBC_NEXGEN32E_A_OBJS) \ $(foreach x,$(LIBC_NEXGEN32E_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/libc/nexgen32e/threaded.o: \ +o/$(MODE)/libc/nexgen32e/threaded.o: private \ OVERRIDE_CFLAGS += \ $(NO_MAGIC) \ -fno-sanitize=all diff --git a/libc/rand/rand.mk b/libc/rand/rand.mk index c96a17250..64fd1425a 100644 --- a/libc/rand/rand.mk +++ b/libc/rand/rand.mk @@ -45,7 +45,7 @@ $(LIBC_RAND_A).pkg: \ $(LIBC_RAND_A_OBJS) \ $(foreach x,$(LIBC_RAND_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/libc/rand/mt19937-64.o: \ +o/$(MODE)/libc/rand/mt19937-64.o: private \ OVERRIDE_CFLAGS += \ -ffunction-sections diff --git a/libc/runtime/runtime.mk b/libc/runtime/runtime.mk index e669bf1e8..f0162b973 100644 --- a/libc/runtime/runtime.mk +++ b/libc/runtime/runtime.mk @@ -63,7 +63,7 @@ $(LIBC_RUNTIME_A).pkg: \ # asan and ubsan can be function traced # we can't use function tracing because: # this is the function tracing runtime -o/$(MODE)/libc/runtime/ftracer.o: \ +o/$(MODE)/libc/runtime/ftracer.o: private \ OVERRIDE_CFLAGS += \ -x-no-pg \ -mno-fentry \ @@ -88,7 +88,7 @@ o/$(MODE)/libc/runtime/print.greg.o \ o/$(MODE)/libc/runtime/stackchkfail.o \ o/$(MODE)/libc/runtime/stackchkfaillocal.o \ o/$(MODE)/libc/runtime/winmain.greg.o \ -o/$(MODE)/libc/runtime/opensymboltable.o: \ +o/$(MODE)/libc/runtime/opensymboltable.o: private \ OVERRIDE_CFLAGS += \ -Os \ -ffreestanding \ @@ -96,11 +96,11 @@ o/$(MODE)/libc/runtime/opensymboltable.o: \ # must use alloca() # can't use asan or any runtime services -o/$(MODE)/libc/runtime/fork-nt.o: \ +o/$(MODE)/libc/runtime/fork-nt.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED -o/$(MODE)/libc/runtime/qsort.o: \ +o/$(MODE)/libc/runtime/qsort.o: private \ OVERRIDE_CFLAGS += \ -Og @@ -108,11 +108,11 @@ o/$(MODE)/libc/runtime/qsort.o: \ o//libc/runtime/mmap.o \ o//libc/runtime/munmap.o \ o//libc/runtime/memtrack.greg.o \ -o//libc/runtime/opensymboltable.greg.o: \ +o//libc/runtime/opensymboltable.greg.o: private \ OVERRIDE_CFLAGS += \ -Os -o/$(MODE)/libc/runtime/ftrace.greg.o: \ +o/$(MODE)/libc/runtime/ftrace.greg.o: private \ OVERRIDE_CFLAGS += \ -mgeneral-regs-only diff --git a/libc/stdio/stdio.mk b/libc/stdio/stdio.mk index 9c0b34f6d..fc7bc65c0 100644 --- a/libc/stdio/stdio.mk +++ b/libc/stdio/stdio.mk @@ -51,11 +51,11 @@ $(LIBC_STDIO_A).pkg: \ $(LIBC_STDIO_A_OBJS) \ $(foreach x,$(LIBC_STDIO_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/libc/stdio/fputc.o: \ +o/$(MODE)/libc/stdio/fputc.o: private \ OVERRIDE_CFLAGS += \ -O3 -o//libc/stdio/appendw.o: \ +o//libc/stdio/appendw.o: private \ OVERRIDE_CFLAGS += \ -Os diff --git a/libc/str/str.mk b/libc/str/str.mk index 813af6569..4066a6e2c 100644 --- a/libc/str/str.mk +++ b/libc/str/str.mk @@ -45,11 +45,11 @@ $(LIBC_STR_A).pkg: \ $(LIBC_STR_A_OBJS) \ $(foreach x,$(LIBC_STR_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/libc/str/memmem.o: \ +o/$(MODE)/libc/str/memmem.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED -o/$(MODE)/libc/str/dosdatetimetounix.o: \ +o/$(MODE)/libc/str/dosdatetimetounix.o: private \ OVERRIDE_CFLAGS += \ -O3 @@ -64,14 +64,14 @@ o/$(MODE)/libc/str/getzipcfileoffset.o \ o/$(MODE)/libc/str/getzipcfileuncompressedsize.o \ o/$(MODE)/libc/str/getziplfilecompressedsize.o \ o/$(MODE)/libc/str/getziplfileuncompressedsize.o \ -o/$(MODE)/libc/str/getzipcfiletimestamps.o: \ +o/$(MODE)/libc/str/getzipcfiletimestamps.o: private \ OVERRIDE_CFLAGS += \ -Os o/$(MODE)/libc/str/iswpunct.o \ o/$(MODE)/libc/str/iswupper.o \ o/$(MODE)/libc/str/iswlower.o \ -o/$(MODE)/libc/str/iswseparator.o: \ +o/$(MODE)/libc/str/iswseparator.o: private \ OVERRIDE_CFLAGS += \ -fno-jump-tables @@ -82,16 +82,16 @@ o/$(MODE)/libc/str/windowsdurationtotimespec.o \ o/$(MODE)/libc/str/timevaltowindowstime.o \ o/$(MODE)/libc/str/timespectowindowstime.o \ o/$(MODE)/libc/str/windowstimetotimeval.o \ -o/$(MODE)/libc/str/windowstimetotimespec.o: \ +o/$(MODE)/libc/str/windowstimetotimespec.o: private \ OVERRIDE_CFLAGS += \ -O2 # we can't use compiler magic because: # kprintf() depends on these functions -o/$(MODE)/libc/fmt/strsignal.greg.o: \ - OVERRIDE_CFLAGS += \ - -fpie \ - -ffreestanding \ +o/$(MODE)/libc/fmt/strsignal.greg.o: private \ + OVERRIDE_CFLAGS += \ + -fpie \ + -ffreestanding \ $(NO_MAGIC) LIBC_STR_LIBS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x))) diff --git a/libc/thread/thread.mk b/libc/thread/thread.mk index cf30a8a2a..eaad77641 100644 --- a/libc/thread/thread.mk +++ b/libc/thread/thread.mk @@ -46,7 +46,7 @@ $(LIBC_THREAD_A).pkg: \ $(LIBC_THREAD_A_OBJS) \ $(foreach x,$(LIBC_THREAD_A_DIRECTDEPS),$($(x)_A).pkg) -o/tinylinux/libc/thread/clone.o: \ +o/tinylinux/libc/thread/clone.o: private \ OVERRIDE_CFLAGS += \ -ffunction-sections diff --git a/libc/time/time.mk b/libc/time/time.mk index d3eed3777..af8f83040 100644 --- a/libc/time/time.mk +++ b/libc/time/time.mk @@ -53,16 +53,16 @@ $(LIBC_TIME_A).pkg: \ $(LIBC_TIME_A_OBJS) \ $(foreach x,$(LIBC_TIME_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/libc/time/strftime.o: \ +o/$(MODE)/libc/time/strftime.o: private \ OVERRIDE_CFLAGS += \ -fno-jump-tables -o/$(MODE)/libc/time/localtime.o: \ +o/$(MODE)/libc/time/localtime.o: private \ OVERRIDE_CFLAGS += \ -fdata-sections \ -ffunction-sections -o/$(MODE)/libc/time/now.o: \ +o/$(MODE)/libc/time/now.o: private \ OVERRIDE_CFLAGS += \ -O3 diff --git a/libc/tinymath/tinymath.mk b/libc/tinymath/tinymath.mk index 19dfa1060..5caf6a56c 100644 --- a/libc/tinymath/tinymath.mk +++ b/libc/tinymath/tinymath.mk @@ -44,7 +44,7 @@ $(LIBC_TINYMATH_A).pkg: \ o/$(MODE)/libc/tinymath/cpow.o \ o/$(MODE)/libc/tinymath/cpowf.o \ o/$(MODE)/libc/tinymath/cpowl.o \ -o/$(MODE)/libc/tinymath/powfin.o : \ +o/$(MODE)/libc/tinymath/powfin.o : private \ OVERRIDE_CFLAGS += \ -ffast-math diff --git a/net/http/http.mk b/net/http/http.mk index 7d4b42d6d..470883106 100644 --- a/net/http/http.mk +++ b/net/http/http.mk @@ -53,11 +53,11 @@ o/$(MODE)/net/http/islacnicip.o \ o/$(MODE)/net/http/isloopbackip.o \ o/$(MODE)/net/http/ismulticastip.o \ o/$(MODE)/net/http/isripeip.o \ -o/$(MODE)/net/http/istestnetip.o: \ +o/$(MODE)/net/http/istestnetip.o: private \ OVERRIDE_CFLAGS += \ -Os -o/$(MODE)/net/http/formathttpdatetime.o: \ +o/$(MODE)/net/http/formathttpdatetime.o: private\ OVERRIDE_CFLAGS += \ -O3 diff --git a/test/libc/alg/test.mk b/test/libc/alg/test.mk index 8b3b5bfc2..e8b91cb20 100644 --- a/test/libc/alg/test.mk +++ b/test/libc/alg/test.mk @@ -55,7 +55,7 @@ o/$(MODE)/test/libc/alg/%.com.dbg: \ $(TEST_LIBC_ALG_OBJS): test/libc/alg/test.mk -$(TEST_LIBC_ALG_OBJS): \ +$(TEST_LIBC_ALG_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin diff --git a/test/libc/bits/test.mk b/test/libc/bits/test.mk index babd1112c..d40450eee 100644 --- a/test/libc/bits/test.mk +++ b/test/libc/bits/test.mk @@ -52,7 +52,7 @@ o/$(MODE)/test/libc/bits/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(TEST_LIBC_BITS_OBJS): \ +$(TEST_LIBC_BITS_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin diff --git a/test/libc/calls/test.mk b/test/libc/calls/test.mk index 11d91893a..000ef4d27 100644 --- a/test/libc/calls/test.mk +++ b/test/libc/calls/test.mk @@ -17,7 +17,10 @@ TEST_LIBC_CALLS_COMS = \ TEST_LIBC_CALLS_BINS = \ $(TEST_LIBC_CALLS_COMS) \ - $(TEST_LIBC_CALLS_COMS:%=%.dbg) + $(TEST_LIBC_CALLS_COMS:%=%.dbg) \ + o/$(MODE)/test/libc/calls/tiny64.elf \ + o/$(MODE)/test/libc/calls/life-nomod.com \ + o/$(MODE)/test/libc/calls/life-classic.com TEST_LIBC_CALLS_TESTS = \ $(TEST_LIBC_CALLS_SRCS_TEST:%.c=o/$(MODE)/%.com.ok) @@ -72,15 +75,6 @@ o/$(MODE)/test/libc/calls/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/test/libc/calls/tiny64.elf.zip.o: test/libc/calls/tiny64.elf - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< - -o/$(MODE)/test/libc/calls/life-nomod.com.zip.o: o/$(MODE)/test/libc/calls/life-nomod.com - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< - -o/$(MODE)/test/libc/calls/life-classic.com.zip.o: o/$(MODE)/test/libc/calls/life-classic.com - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< - o/$(MODE)/test/libc/calls/life-classic.com.dbg: \ $(LIBC_RUNTIME) \ o/$(MODE)/test/libc/calls/life.o \ @@ -95,6 +89,12 @@ o/$(MODE)/test/libc/calls/life-nomod.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) +o/$(MODE)/test/libc/calls/tiny64.elf.zip.o \ +o/$(MODE)/test/libc/calls/life-nomod.com.zip.o \ +o/$(MODE)/test/libc/calls/life-classic.com.zip.o: private \ + ZIPOBJ_FLAGS += \ + -B + .PHONY: o/$(MODE)/test/libc/calls o/$(MODE)/test/libc/calls: \ $(TEST_LIBC_CALLS_BINS) \ diff --git a/test/libc/fmt/test.mk b/test/libc/fmt/test.mk index ccc8603a5..8210441ad 100644 --- a/test/libc/fmt/test.mk +++ b/test/libc/fmt/test.mk @@ -54,7 +54,7 @@ o/$(MODE)/test/libc/fmt/%.com.dbg: \ $(TEST_LIBC_FMT_OBJS): test/libc/fmt/test.mk -$(TEST_LIBC_FMT_OBJS): \ +$(TEST_LIBC_FMT_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin diff --git a/test/libc/intrin/test.mk b/test/libc/intrin/test.mk index d23ed237a..3d5983f8a 100644 --- a/test/libc/intrin/test.mk +++ b/test/libc/intrin/test.mk @@ -58,7 +58,7 @@ o/$(MODE)/test/libc/intrin/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(TEST_LIBC_INTRIN_OBJS): \ +$(TEST_LIBC_INTRIN_OBJS): private \ OVERRIDE_CFLAGS += \ -fno-builtin diff --git a/test/libc/log/test.mk b/test/libc/log/test.mk index 00e06a1f6..cc7c9e34e 100644 --- a/test/libc/log/test.mk +++ b/test/libc/log/test.mk @@ -76,13 +76,10 @@ o/$(MODE)/test/libc/log/backtrace.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/test/libc/log/backtrace.com.zip.o: \ - o/$(MODE)/test/libc/log/backtrace.com - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< - -o/$(MODE)/test/libc/log/backtrace.com.dbg.zip.o: \ - o/$(MODE)/test/libc/log/backtrace.com.dbg - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< +o/$(MODE)/test/libc/log/backtrace.com.zip.o \ +o/$(MODE)/test/libc/log/backtrace.com.dbg.zip.o: private \ + ZIPOBJ_FLAGS += \ + -B .PHONY: o/$(MODE)/test/libc/log o/$(MODE)/test/libc/log: \ diff --git a/test/libc/mem/test.mk b/test/libc/mem/test.mk index b27d9b1cf..855059240 100644 --- a/test/libc/mem/test.mk +++ b/test/libc/mem/test.mk @@ -97,9 +97,9 @@ o/$(MODE)/test/libc/mem/prog/life.elf: \ o/$(MODE)/tool/build/assimilate.com \ o/$(MODE)/test/libc/mem/prog/life.elf -o/$(MODE)/test/libc/mem/prog/life.elf.zip.o: \ - o/$(MODE)/test/libc/mem/prog/life.elf - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< +o/$(MODE)/test/libc/mem/prog/life.elf.zip.o: private \ + ZIPOBJ_FLAGS += \ + -B ################################################################################ @@ -122,13 +122,13 @@ o/$(MODE)/test/libc/mem/prog/sock.elf: \ o/$(MODE)/tool/build/assimilate.com \ o/$(MODE)/test/libc/mem/prog/sock.elf -o/$(MODE)/test/libc/mem/prog/sock.elf.zip.o: \ - o/$(MODE)/test/libc/mem/prog/sock.elf - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< +o/$(MODE)/test/libc/mem/prog/sock.elf.zip.o: private \ + ZIPOBJ_FLAGS += \ + -B ################################################################################ -$(TEST_LIBC_MEM_OBJS): \ +$(TEST_LIBC_MEM_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin diff --git a/test/libc/nexgen32e/test.mk b/test/libc/nexgen32e/test.mk index ff95a48a6..2b7792f5d 100644 --- a/test/libc/nexgen32e/test.mk +++ b/test/libc/nexgen32e/test.mk @@ -67,7 +67,7 @@ o/$(MODE)/test/libc/nexgen32e/stackrwx_test.com.ok: \ o/$(MODE)/test/libc/nexgen32e/stackrwx_test.com @$(COMPILE) -ATEST -tT$@ $^ $(filter-out openbsd,$(HOSTS)) -$(TEST_LIBC_NEXGEN32E_OBJS): \ +$(TEST_LIBC_NEXGEN32E_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin diff --git a/test/libc/rand/test.mk b/test/libc/rand/test.mk index 9195d233b..8c00959e8 100644 --- a/test/libc/rand/test.mk +++ b/test/libc/rand/test.mk @@ -57,7 +57,7 @@ o/$(MODE)/test/libc/rand/%.com.dbg: \ $(TEST_LIBC_RAND_OBJS): test/libc/rand/test.mk -$(TEST_LIBC_RAND_OBJS): \ +$(TEST_LIBC_RAND_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin diff --git a/test/libc/runtime/test.mk b/test/libc/runtime/test.mk index 38f4b581f..dc75e4c57 100644 --- a/test/libc/runtime/test.mk +++ b/test/libc/runtime/test.mk @@ -71,7 +71,7 @@ o/$(MODE)/test/libc/runtime/ape_test.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(TEST_LIBC_RUNTIME_OBJS): \ +$(TEST_LIBC_RUNTIME_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin @@ -79,7 +79,7 @@ o/$(MODE)/test/libc/runtime/getenv_test.com.runs: \ o/$(MODE)/test/libc/runtime/getenv_test.com @HELLO=THERE build/runit $@ $< -o/$(MODE)/test/libc/runtime/itsatrap_test.o: \ +o/$(MODE)/test/libc/runtime/itsatrap_test.o: private \ OVERRIDE_CFLAGS += \ -fno-sanitize=all \ -ftrapv diff --git a/test/libc/stdio/test.mk b/test/libc/stdio/test.mk index d88c6c47d..0ac46861a 100644 --- a/test/libc/stdio/test.mk +++ b/test/libc/stdio/test.mk @@ -65,7 +65,7 @@ o/$(MODE)/test/libc/stdio/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(TEST_LIBC_STDIO_OBJS): \ +$(TEST_LIBC_STDIO_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin diff --git a/test/libc/str/test.mk b/test/libc/str/test.mk index 801f603ea..4d1cef43b 100644 --- a/test/libc/str/test.mk +++ b/test/libc/str/test.mk @@ -63,7 +63,7 @@ o/$(MODE)/test/libc/str/str.pkg: \ $(TEST_LIBC_STR_OBJS) \ $(foreach x,$(TEST_LIBC_STR_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/test/libc/str/tpenc_test.o: \ +o/$(MODE)/test/libc/str/tpenc_test.o: private \ OVERRIDE_CFLAGS += \ $(TRADITIONAL) @@ -86,11 +86,11 @@ o/$(MODE)/test/libc/str/blake2.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(TEST_LIBC_STR_OBJS): \ +$(TEST_LIBC_STR_OBJS): private \ DEFAULT_CCFLAGS += \ -fno-builtin -o/$(MODE)/test/libc/str/memmove_test.o: \ +o/$(MODE)/test/libc/str/memmove_test.o: private \ OVERRIDE_CFLAGS += \ -O2 -D_FORTIFY_SOURCE=2 diff --git a/test/libc/tinymath/test.mk b/test/libc/tinymath/test.mk index c3da9b72e..86133b3ed 100644 --- a/test/libc/tinymath/test.mk +++ b/test/libc/tinymath/test.mk @@ -57,7 +57,7 @@ o/$(MODE)/test/libc/tinymath/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(TEST_LIBC_TINYMATH_OBJS): \ +$(TEST_LIBC_TINYMATH_OBJS): private \ OVERRIDE_CFLAGS += \ -fno-builtin diff --git a/test/tool/plinko/test.mk b/test/tool/plinko/test.mk index 7fe9cfb11..7cb129807 100644 --- a/test/tool/plinko/test.mk +++ b/test/tool/plinko/test.mk @@ -77,11 +77,11 @@ o/$(MODE)/test/tool/plinko/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/test/tool/plinko/plinko_test.com.runs: \ +o/$(MODE)/test/tool/plinko/plinko_test.com.runs: private \ QUOTA = -M100g -o/$(MODE)/test/tool/plinko/algebra_test.lisp.zip.o: ZIPOBJ_FLAGS += -B -o/$(MODE)/test/tool/plinko/library_test.lisp.zip.o: ZIPOBJ_FLAGS += -B +o/$(MODE)/test/tool/plinko/algebra_test.lisp.zip.o: private ZIPOBJ_FLAGS += -B +o/$(MODE)/test/tool/plinko/library_test.lisp.zip.o: private ZIPOBJ_FLAGS += -B .PHONY: o/$(MODE)/test/tool/plinko o/$(MODE)/test/tool/plinko: \ diff --git a/third_party/argon2/argon2.mk b/third_party/argon2/argon2.mk index 88e9eb1ea..fd257d24a 100644 --- a/third_party/argon2/argon2.mk +++ b/third_party/argon2/argon2.mk @@ -44,7 +44,7 @@ $(THIRD_PARTY_ARGON2_A).pkg: \ # we can't use ubsan because: # it's just too slow to be practical (like 6s vs. 13s) -$(THIRD_PARTY_ARGON2_A_OBJS): \ +$(THIRD_PARTY_ARGON2_A_OBJS): private \ OVERRIDE_CFLAGS += \ -ffunction-sections \ -fdata-sections \ diff --git a/third_party/bzip2/bzip2.mk b/third_party/bzip2/bzip2.mk index 8c8e2fcde..e25627698 100644 --- a/third_party/bzip2/bzip2.mk +++ b/third_party/bzip2/bzip2.mk @@ -63,7 +63,7 @@ o/$(MODE)/third_party/bzip2/bzip2recover.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(THIRD_PARTY_BZIP2_A_OBJS): \ +$(THIRD_PARTY_BZIP2_A_OBJS): private \ OVERRIDE_CFLAGS += \ -ffunction-sections \ -fdata-sections diff --git a/third_party/chibicc/chibicc.mk b/third_party/chibicc/chibicc.mk index b3160b940..8f5610484 100644 --- a/third_party/chibicc/chibicc.mk +++ b/third_party/chibicc/chibicc.mk @@ -95,7 +95,7 @@ o/$(MODE)/third_party/chibicc/as.com.dbg: \ $(THIRD_PARTY_CHIBICC_A).pkg @$(APELINK) -o/$(MODE)/third_party/chibicc/chibicc.o: \ +o/$(MODE)/third_party/chibicc/chibicc.o: private \ OVERRIDE_CPPFLAGS += $(THIRD_PARTY_CHIBICC_DEFINES) THIRD_PARTY_CHIBICC_LIBS = $(foreach x,$(THIRD_PARTY_CHIBICC_ARTIFACTS),$($(x))) diff --git a/third_party/chibicc/test/test.mk b/third_party/chibicc/test/test.mk index a4ea3ea9e..f5a2cdd59 100644 --- a/third_party/chibicc/test/test.mk +++ b/third_party/chibicc/test/test.mk @@ -74,7 +74,7 @@ o/$(MODE)/third_party/chibicc/test/%.o: \ $(CHIBICC) @$(COMPILE) -AOBJECTIFY.c $(CHIBICC) $(CHIBICC_FLAGS) $(OUTPUT_OPTION) -c $< -o/$(MODE)/third_party/chibicc/test/int128_test.o: QUOTA = -M1024m +o/$(MODE)/third_party/chibicc/test/int128_test.o: private QUOTA = -M1024m .PHONY: o/$(MODE)/third_party/chibicc/test o/$(MODE)/third_party/chibicc/test: \ diff --git a/third_party/compiler_rt/compiler_rt.mk b/third_party/compiler_rt/compiler_rt.mk index 575d5e9d7..532bdacde 100644 --- a/third_party/compiler_rt/compiler_rt.mk +++ b/third_party/compiler_rt/compiler_rt.mk @@ -44,9 +44,9 @@ $(THIRD_PARTY_COMPILER_RT_A).pkg: \ $(THIRD_PARTY_COMPILER_RT_A_OBJS) \ $(foreach x,$(THIRD_PARTY_COMPILER_RT_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_COMPILER_RT_A_OBJS): \ - DEFAULT_CFLAGS += \ - $(OLD_CODE) \ +$(THIRD_PARTY_COMPILER_RT_A_OBJS): private \ + DEFAULT_CFLAGS += \ + $(OLD_CODE) \ -DCRT_HAS_128BIT THIRD_PARTY_COMPILER_RT_LIBS = $(foreach x,$(THIRD_PARTY_COMPILER_RT_ARTIFACTS),$($(x))) diff --git a/third_party/dlmalloc/dlmalloc.mk b/third_party/dlmalloc/dlmalloc.mk index 516441077..002a3e39b 100644 --- a/third_party/dlmalloc/dlmalloc.mk +++ b/third_party/dlmalloc/dlmalloc.mk @@ -53,20 +53,20 @@ $(THIRD_PARTY_DLMALLOC_A).pkg: \ # README file recommends -O3 # It does double performance in default mode o//third_party/dlmalloc/dlmalloc.o \ -o/rel/third_party/dlmalloc/dlmalloc.o: \ +o/rel/third_party/dlmalloc/dlmalloc.o: private \ OVERRIDE_CFLAGS += \ -O3 # we can't use address sanitizer because: # address sanitizer depends on dlmalloc -o/$(MODE)/third_party/dlmalloc/dlmalloc.o: \ +o/$(MODE)/third_party/dlmalloc/dlmalloc.o: private \ OVERRIDE_CFLAGS += \ -ffreestanding \ -fno-sanitize=address # we must segregate codegen because: # file contains multiple independently linkable apis -o/$(MODE)/third_party/dlmalloc/dlmalloc.o: \ +o/$(MODE)/third_party/dlmalloc/dlmalloc.o: private \ OVERRIDE_CFLAGS += \ -ffunction-sections \ -fdata-sections diff --git a/third_party/double-conversion/double-conversion.mk b/third_party/double-conversion/double-conversion.mk index 3a75a29eb..ed04f860e 100644 --- a/third_party/double-conversion/double-conversion.mk +++ b/third_party/double-conversion/double-conversion.mk @@ -91,7 +91,7 @@ $(THIRD_PARTY_DOUBLECONVERSION_A).pkg: \ $(THIRD_PARTY_DOUBLECONVERSION_A_OBJS) \ $(foreach x,$(THIRD_PARTY_DOUBLECONVERSION_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_DOUBLECONVERSION_A_OBJS): \ +$(THIRD_PARTY_DOUBLECONVERSION_A_OBJS): private \ OVERRIDE_CXXFLAGS += \ -ffunction-sections \ -fdata-sections diff --git a/third_party/gdtoa/gdtoa.mk b/third_party/gdtoa/gdtoa.mk index f7bf0c7cf..9607c285b 100644 --- a/third_party/gdtoa/gdtoa.mk +++ b/third_party/gdtoa/gdtoa.mk @@ -38,7 +38,7 @@ $(THIRD_PARTY_GDTOA_A).pkg: \ $(THIRD_PARTY_GDTOA_A_OBJS) \ $(foreach x,$(THIRD_PARTY_GDTOA_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_GDTOA_A_OBJS): \ +$(THIRD_PARTY_GDTOA_A_OBJS): private \ OVERRIDE_CFLAGS += \ -ffunction-sections \ -fdata-sections diff --git a/third_party/libcxx/libcxx.mk b/third_party/libcxx/libcxx.mk index 24197d718..924734a25 100644 --- a/third_party/libcxx/libcxx.mk +++ b/third_party/libcxx/libcxx.mk @@ -179,12 +179,12 @@ $(THIRD_PARTY_LIBCXX_A).pkg: \ $(THIRD_PARTY_LIBCXX_A_OBJS) \ $(foreach x,$(THIRD_PARTY_LIBCXX_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_LIBCXX_A_OBJS): \ +$(THIRD_PARTY_LIBCXX_A_OBJS): private \ OVERRIDE_CXXFLAGS += \ -ffunction-sections \ -fdata-sections -o/$(MODE)/third_party/libcxx/locale.o: QUOTA = -C32 -M1024m +o/$(MODE)/third_party/libcxx/locale.o: private QUOTA = -C32 -M1024m THIRD_PARTY_LIBCXX_LIBS = $(foreach x,$(THIRD_PARTY_LIBCXX_ARTIFACTS),$($(x))) THIRD_PARTY_LIBCXX_SRCS = $(foreach x,$(THIRD_PARTY_LIBCXX_ARTIFACTS),$($(x)_SRCS)) diff --git a/third_party/linenoise/linenoise.mk b/third_party/linenoise/linenoise.mk index 016c7ff31..9c9ea594a 100644 --- a/third_party/linenoise/linenoise.mk +++ b/third_party/linenoise/linenoise.mk @@ -44,7 +44,7 @@ $(THIRD_PARTY_LINENOISE_A).pkg: \ $(THIRD_PARTY_LINENOISE_A_OBJS) \ $(foreach x,$(THIRD_PARTY_LINENOISE_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_LINENOISE_A_OBJS): \ +$(THIRD_PARTY_LINENOISE_A_OBJS): private \ OVERRIDE_CFLAGS += \ -fno-jump-tables \ -ffunction-sections \ diff --git a/third_party/lua/lua.mk b/third_party/lua/lua.mk index 3247ac2c5..7c9497e82 100644 --- a/third_party/lua/lua.mk +++ b/third_party/lua/lua.mk @@ -149,19 +149,19 @@ $(THIRD_PARTY_LUA_A).pkg: \ $(foreach x,$(THIRD_PARTY_LUA_A_DIRECTDEPS),$($(x)_A).pkg) o/$(MODE)/third_party/lua/lmathlib.o \ -o//third_party/lua/lgc.o: \ +o//third_party/lua/lgc.o: private \ OVERRIDE_CFLAGS += \ -O2 -o/$(MODE)/third_party/lua/lvm.o: \ +o/$(MODE)/third_party/lua/lvm.o: private \ OVERRIDE_CFLAGS += \ -fno-gcse -o/$(MODE)/third_party/lua/lauxlib.o: \ +o/$(MODE)/third_party/lua/lauxlib.o: private \ OVERRIDE_CFLAGS += \ -DSTACK_FRAME_UNLIMITED -$(THIRD_PARTY_LUA_A_OBJS): \ +$(THIRD_PARTY_LUA_A_OBJS): private \ OVERRIDE_CFLAGS += \ -ffunction-sections \ -fdata-sections diff --git a/third_party/lz4cli/lz4cli.mk b/third_party/lz4cli/lz4cli.mk index 15d9600c4..7fb87a94a 100644 --- a/third_party/lz4cli/lz4cli.mk +++ b/third_party/lz4cli/lz4cli.mk @@ -34,7 +34,7 @@ o/$(MODE)/third_party/lz4cli/lz4.o \ o/$(MODE)/third_party/lz4cli/lz4io.o \ o/$(MODE)/third_party/lz4cli/lz4hc.o \ o/$(MODE)/third_party/lz4cli/lz4frame.o \ -o/$(MODE)/third_party/lz4cli/datagen.o: \ +o/$(MODE)/third_party/lz4cli/datagen.o: private \ DEFAULT_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED @@ -48,7 +48,7 @@ THIRD_PARTY_LZ4CLI_DIRECTDEPS = \ THIRD_PARTY_LZ4CLI_DEPS := \ $(call uniq,$(foreach x,$(THIRD_PARTY_LZ4CLI_DIRECTDEPS),$($(x)))) -$(THIRD_PARTY_LZ4CLI_OBJS): \ +$(THIRD_PARTY_LZ4CLI_OBJS): private \ DEFAULT_CPPFLAGS += \ -isystem third_party/lz4cli diff --git a/third_party/make/make.mk b/third_party/make/make.mk index d91b73c87..f2f8cb553 100644 --- a/third_party/make/make.mk +++ b/third_party/make/make.mk @@ -154,15 +154,15 @@ o/$(MODE)/third_party/make/make.com.dbg: \ o/$(MODE)/third_party/make/strcache.o \ o/$(MODE)/third_party/make/expand.o \ -o/$(MODE)/third_party/make/read.o: \ +o/$(MODE)/third_party/make/read.o: private \ OVERRIDE_CFLAGS += \ -O2 -o/$(MODE)/third_party/make/hash.o: \ +o/$(MODE)/third_party/make/hash.o: private \ OVERRIDE_CFLAGS += \ -O3 -$(THIRD_PARTY_MAKE_OBJS): \ +$(THIRD_PARTY_MAKE_OBJS): private \ OVERRIDE_CFLAGS += \ -DSTACK_FRAME_UNLIMITED \ -DHAVE_CONFIG_H \ diff --git a/third_party/maxmind/maxmind.mk b/third_party/maxmind/maxmind.mk index 20abe47ce..19d030d6f 100644 --- a/third_party/maxmind/maxmind.mk +++ b/third_party/maxmind/maxmind.mk @@ -42,7 +42,7 @@ $(THIRD_PARTY_MAXMIND_A).pkg: \ $(THIRD_PARTY_MAXMIND_A_OBJS) \ $(foreach x,$(THIRD_PARTY_MAXMIND_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_MAXMIND_A_OBJS): \ +$(THIRD_PARTY_MAXMIND_A_OBJS): private \ OVERRIDE_CFLAGS += \ -fdata-sections \ -ffunction-sections diff --git a/third_party/mbedtls/mbedtls.mk b/third_party/mbedtls/mbedtls.mk index 030e78dd5..52c0ea862 100644 --- a/third_party/mbedtls/mbedtls.mk +++ b/third_party/mbedtls/mbedtls.mk @@ -49,29 +49,29 @@ $(THIRD_PARTY_MBEDTLS_A).pkg: \ $(THIRD_PARTY_MBEDTLS_A_OBJS) \ $(foreach x,$(THIRD_PARTY_MBEDTLS_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_MBEDTLS_A_OBJS): \ +$(THIRD_PARTY_MBEDTLS_A_OBJS): private \ OVERRIDE_CFLAGS += \ -fdata-sections \ -ffunction-sections -o/$(MODE)/third_party/mbedtls/everest.o: \ +o/$(MODE)/third_party/mbedtls/everest.o: private \ OVERRIDE_CFLAGS += \ -O3 o/$(MODE)/third_party/mbedtls/bigmul4.o \ -o/$(MODE)/third_party/mbedtls/bigmul6.o: \ +o/$(MODE)/third_party/mbedtls/bigmul6.o: private \ OVERRIDE_CFLAGS += \ -O2 -o/$(MODE)/third_party/mbedtls/shiftright-avx.o: \ +o/$(MODE)/third_party/mbedtls/shiftright-avx.o: private \ OVERRIDE_CFLAGS += \ -O3 -mavx -o/$(MODE)/third_party/mbedtls/shiftright2-avx.o: \ +o/$(MODE)/third_party/mbedtls/shiftright2-avx.o: private \ OVERRIDE_CFLAGS += \ -O3 -mavx -o/$(MODE)/third_party/mbedtls/zeroize.o: \ +o/$(MODE)/third_party/mbedtls/zeroize.o: private \ OVERRIDE_CFLAGS += \ -O3 \ -x-no-pg \ diff --git a/third_party/mbedtls/test/test.mk b/third_party/mbedtls/test/test.mk index 95df2b1b1..2e72e8378 100644 --- a/third_party/mbedtls/test/test.mk +++ b/third_party/mbedtls/test/test.mk @@ -139,11 +139,11 @@ o/$(MODE)/third_party/mbedtls/test/%.com: o/$(MODE)/third_party/mbedtls/test/%.c o/$(MODE)/third_party/mbedtls/test/%.com.runs: o/$(MODE)/third_party/mbedtls/test/%.com @$(COMPILE) -ACHECK -tT$@ $< $(TESTARGS) -$(THIRD_PARTY_MBEDTLS_TEST_OBJS): \ +$(THIRD_PARTY_MBEDTLS_TEST_OBJS): private \ OVERRIDE_CFLAGS += \ -DSTACK_FRAME_UNLIMITED -o/$(MODE)/third_party/mbedtls/test/lib.o: \ +o/$(MODE)/third_party/mbedtls/test/lib.o: private \ OVERRIDE_CFLAGS += \ -fdata-sections \ -ffunction-sections @@ -1363,4 +1363,4 @@ o/$(MODE)/third_party/mbedtls/test/secp384r1_test.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/third_party/mbedtls/test/test_suite_asn1parse.com.runs: QUOTA = -M512m +o/$(MODE)/third_party/mbedtls/test/test_suite_asn1parse.com.runs: private QUOTA = -M512m diff --git a/third_party/python/python.mk b/third_party/python/python.mk index f31a713bd..ceeeb932b 100644 --- a/third_party/python/python.mk +++ b/third_party/python/python.mk @@ -3668,7 +3668,7 @@ o/$(MODE)/third_party/python/Modules/posixmodule.o: \ third_party/python/Modules/clinic/posixmodule.inc $(THIRD_PARTY_PYTHON_STAGE1_A_OBJS) \ -$(THIRD_PARTY_PYTHON_STAGE2_A_OBJS): \ +$(THIRD_PARTY_PYTHON_STAGE2_A_OBJS): private \ OVERRIDE_CFLAGS += \ -fwrapv \ -ffunction-sections \ @@ -3677,7 +3677,7 @@ $(THIRD_PARTY_PYTHON_STAGE2_A_OBJS): \ o/$(MODE)/third_party/python/Python/ceval.o \ o/$(MODE)/third_party/python/Objects/object.o \ o/$(MODE)/third_party/python/Python/graminit.o \ -o/$(MODE)/third_party/python/Objects/abstract.o: \ +o/$(MODE)/third_party/python/Objects/abstract.o: private \ OVERRIDE_CFLAGS += \ -fno-function-sections \ -fno-data-sections @@ -3695,7 +3695,7 @@ o/$(MODE)/third_party/python/Modules/expat/xmltok.o \ o/$(MODE)/third_party/python/Objects/memoryobject.o \ o/$(MODE)/third_party/python/Objects/unicodeobject.o \ o/$(MODE)/third_party/python/Python/ast.o \ -o/$(MODE)/third_party/python/Python/compile.o: \ +o/$(MODE)/third_party/python/Python/compile.o: private \ OVERRIDE_CFLAGS += \ -fpie @@ -3724,61 +3724,61 @@ o//third_party/python/Objects/dictobject.o \ o//third_party/python/Objects/obmalloc.o \ o//third_party/python/Objects/funcobject.o \ o//third_party/python/Objects/pyhash.o \ -o//third_party/python/Python/ceval.o: \ +o//third_party/python/Python/ceval.o: private \ OVERRIDE_CFLAGS += \ -O2 $(THIRD_PARTY_PYTHON_STAGE1_A_OBJS) \ -$(THIRD_PARTY_PYTHON_STAGE2_A_OBJS): \ +$(THIRD_PARTY_PYTHON_STAGE2_A_OBJS): private \ OVERRIDE_CPPFLAGS += \ -DPy_BUILD_CORE \ -DMULTIARCH='"x86_64-cosmo"' ifneq ($(MODE),dbg) $(THIRD_PARTY_PYTHON_STAGE1_A_OBJS) \ -$(THIRD_PARTY_PYTHON_STAGE2_A_OBJS): \ +$(THIRD_PARTY_PYTHON_STAGE2_A_OBJS): private \ OVERRIDE_CPPFLAGS += \ -DNDEBUG endif -o/$(MODE)/third_party/python/Python/sysmodule.o: \ +o/$(MODE)/third_party/python/Python/sysmodule.o: private \ OVERRIDE_CFLAGS += \ -DABIFLAGS='"m"' # NOTE: Care must be taken that the compiler doesn't try to "optimize" # the indirect jumps by sharing them between all opcodes. Such # optimizations can be disabled on gcc by using -fno-gcse. -o/$(MODE)/third_party/python/Python/ceval.o: \ +o/$(MODE)/third_party/python/Python/ceval.o: private \ OVERRIDE_CFLAGS += \ -fno-gcse # Issue #23654: Turn off ICC's tail call optimization for the # stack_overflow generator. ICC turns the recursive tail # call into a loop. [Let's do GCC too, just to be safe.] -o/$(MODE)/third_party/python/Modules/faulthandler.o: \ +o/$(MODE)/third_party/python/Modules/faulthandler.o: private \ OVERRIDE_CFLAGS += \ -fno-optimize-sibling-calls -o/$(MODE)/third_party/python/Lib/mimetypes.o: PYFLAGS += -Y.python/mime.types -o/$(MODE)/third_party/python/Lib/test/test_baseexception.o: PYFLAGS += -Y.python/test/exception_hierarchy.txt -o/$(MODE)/third_party/python/Lib/test/test_cmath.o: PYFLAGS += -Y.python/test/ieee754.txt -o/$(MODE)/third_party/python/Lib/test/test_difflib.o: PYFLAGS += -Y.python/test/test_difflib_expect.html +o/$(MODE)/third_party/python/Lib/mimetypes.o: private PYFLAGS += -Y.python/mime.types +o/$(MODE)/third_party/python/Lib/test/test_baseexception.o: private PYFLAGS += -Y.python/test/exception_hierarchy.txt +o/$(MODE)/third_party/python/Lib/test/test_cmath.o: private PYFLAGS += -Y.python/test/ieee754.txt +o/$(MODE)/third_party/python/Lib/test/test_difflib.o: private PYFLAGS += -Y.python/test/test_difflib_expect.html -o/$(MODE)/third_party/python/Lib/test/test_cosmo.o: \ +o/$(MODE)/third_party/python/Lib/test/test_cosmo.o: private \ PYFLAGS += \ -Y.python/test/hello.com -o/$(MODE)/third_party/python/Lib/test/test_asdl_parser.o: \ +o/$(MODE)/third_party/python/Lib/test/test_asdl_parser.o: private \ PYFLAGS += \ -Y.python/test/Python.asdl -o/$(MODE)/third_party/python/Lib/test/test_math.o: \ +o/$(MODE)/third_party/python/Lib/test/test_math.o: private \ PYFLAGS += \ -Y.python/test/ieee754.txt \ -Y.python/test/math_testcases.txt \ -Y.python/test/cmath_testcases.txt -o/$(MODE)/third_party/python/Lib/test/audiotests.o: \ +o/$(MODE)/third_party/python/Lib/test/audiotests.o: private \ PYFLAGS += \ -Y.python/test/audiodata/pluck-alaw.aifc \ -Y.python/test/audiodata/pluck-alaw.aifc \ @@ -3790,25 +3790,25 @@ o/$(MODE)/third_party/python/Lib/test/audiotests.o: \ -Y.python/test/audiodata/pluck-ulaw.aifc \ -Y.python/test/Sine-1000Hz-300ms.aif -o/$(MODE)/third_party/python/Lib/test/test_wave.o: \ +o/$(MODE)/third_party/python/Lib/test/test_wave.o: private \ PYFLAGS += \ -Y.python/test/audiodata/pluck-pcm16.wav \ -Y.python/test/audiodata/pluck-pcm24.wav \ -Y.python/test/audiodata/pluck-pcm32.wav -o/$(MODE)/third_party/python/Lib/test/test_sax.o: \ +o/$(MODE)/third_party/python/Lib/test/test_sax.o: private \ PYFLAGS += \ -Y.python/test/xmltestdata/test.xml \ -Y.python/test/xmltestdata/test.xml.out \ -Y.python/test/xmltestdata/simple.xml \ -Y.python/test/xmltestdata/simple-ns.xml -o/$(MODE)/third_party/python/Lib/test/test_float.o: \ +o/$(MODE)/third_party/python/Lib/test/test_float.o: private \ PYFLAGS += \ -Y.python/test/floating_points.txt \ -Y.python/test/formatfloat_testcases.txt -o/$(MODE)/third_party/python/Lib/test/test_tarfile.o: \ +o/$(MODE)/third_party/python/Lib/test/test_tarfile.o: private \ PYFLAGS += \ -Y.python/test/zipdir.zip \ -Y.python/test/testtar.tar \ @@ -3819,17 +3819,17 @@ o/$(MODE)/third_party/python/Lib/test/test_tarfile.o: \ -Y.python/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt \ -Y.python/test/tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt -o/$(MODE)/third_party/python/Lib/test/test_random.o: \ +o/$(MODE)/third_party/python/Lib/test/test_random.o: private \ PYFLAGS += \ -Y.python/test/randv2_32.pck \ -Y.python/test/randv2_64.pck \ -Y.python/test/randv3.pck -o/$(MODE)/third_party/python/Lib/test/test_pstats.o: \ +o/$(MODE)/third_party/python/Lib/test/test_pstats.o: private \ PYFLAGS += \ -Y.python/test/pstats.pck -o/$(MODE)/third_party/python/Lib/test/test_sunau.o: \ +o/$(MODE)/third_party/python/Lib/test/test_sunau.o: private \ PYFLAGS += \ -Y.python/test/audiodata/pluck-alaw.aifc \ -Y.python/test/audiodata/pluck-pcm16.aiff \ @@ -3847,23 +3847,23 @@ o/$(MODE)/third_party/python/Lib/test/test_sunau.o: \ -Y.python/test/audiodata/pluck-ulaw.aifc \ -Y.python/test/audiodata/pluck-ulaw.au -o/$(MODE)/third_party/python/Lib/test/test_py_compile.o: \ +o/$(MODE)/third_party/python/Lib/test/test_py_compile.o: private \ PYFLAGS += \ -Y.python/test/bad_coding2.py -o/$(MODE)/third_party/python/Lib/test/test_tokenize.o: \ +o/$(MODE)/third_party/python/Lib/test/test_tokenize.o: private \ PYFLAGS += \ -Y.python/test/bad_coding.py \ -Y.python/test/bad_coding2.py -o/$(MODE)/third_party/python/Lib/test/test_doctest.o: \ +o/$(MODE)/third_party/python/Lib/test/test_doctest.o: private \ PYFLAGS += \ -Y.python/test/test_doctest.txt \ -Y.python/test/test_doctest2.txt \ -Y.python/test/test_doctest3.txt \ -Y.python/test/test_doctest4.txt -o/$(MODE)/third_party/python/Lib/test/test_imghdr.o: \ +o/$(MODE)/third_party/python/Lib/test/test_imghdr.o: private \ PYFLAGS += \ -Y.python/test/imghdrdata/ \ -Y.python/test/imghdrdata/python.bmp \ @@ -3880,7 +3880,7 @@ o/$(MODE)/third_party/python/Lib/test/test_imghdr.o: \ -Y.python/test/imghdrdata/python.webp \ -Y.python/test/imghdrdata/python.xbm -o/$(MODE)/third_party/python/Lib/test/test_sndhdr.o: \ +o/$(MODE)/third_party/python/Lib/test/test_sndhdr.o: private \ PYFLAGS += \ -Y.python/test/sndhdrdata/ \ -Y.python/test/sndhdrdata/sndhdr.8svx \ @@ -3892,7 +3892,7 @@ o/$(MODE)/third_party/python/Lib/test/test_sndhdr.o: \ -Y.python/test/sndhdrdata/sndhdr.voc \ -Y.python/test/sndhdrdata/sndhdr.wav -o/$(MODE)/third_party/python/Lib/test/test_email/test_email.o: \ +o/$(MODE)/third_party/python/Lib/test/test_email/test_email.o: private \ PYFLAGS += \ -Y.python/test/test_email/data/PyBanner048.gif \ -Y.python/test/test_email/data/audiotest.au \ @@ -3946,7 +3946,7 @@ o/$(MODE)/third_party/python/Lib/test/test_email/test_email.o: \ o/$(MODE)/third_party/python/Lib/test/test_xml_etree_c.o \ o/$(MODE)/third_party/python/Lib/test/test_minidom.o \ -o/$(MODE)/third_party/python/Lib/test/test_pulldom.o: \ +o/$(MODE)/third_party/python/Lib/test/test_pulldom.o: private \ PYFLAGS += \ -Y.python/test/xmltestdata/ \ -Y.python/test/xmltestdata/simple.xml \ @@ -3955,7 +3955,7 @@ o/$(MODE)/third_party/python/Lib/test/test_pulldom.o: \ -Y.python/test/xmltestdata/test.xml.out \ -Y.python/test/xmltestdata/test.xml -o/$(MODE)/third_party/python/Lib/test/test_decimal.o: \ +o/$(MODE)/third_party/python/Lib/test/test_decimal.o: private \ PYFLAGS += \ -Y.python/test/decimaltestdata/ \ -Y.python/test/decimaltestdata/nexttoward.decTest \ @@ -4102,13 +4102,13 @@ o/$(MODE)/third_party/python/Lib/test/test_decimal.o: \ -Y.python/test/decimaltestdata/ddMinMag.decTest \ -Y.python/test/decimaltestdata/divide.decTest -o/$(MODE)/third_party/python/Lib/test/test_codecmaps_cn.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecmaps_cn.o: private \ PYFLAGS += \ -Y.python/test/EUC-CN.TXT \ -Y.python/test/CP936.TXT \ -Y.python/test/gb-18030-2000.ucm -o/$(MODE)/third_party/python/Lib/test/test_codecmaps_jp.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecmaps_jp.o: private \ PYFLAGS += \ -Y.python/test/CP932.TXT \ -Y.python/test/EUC-JP.TXT \ @@ -4116,28 +4116,28 @@ o/$(MODE)/third_party/python/Lib/test/test_codecmaps_jp.o: \ -Y.python/test/EUC-JISX0213.TXT \ -Y.python/test/SHIFT_JISX0213.TXT -o/$(MODE)/third_party/python/Lib/test/test_codecmaps_hk.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecmaps_hk.o: private \ PYFLAGS += \ -Y.python/test/BIG5HKSCS-2004.TXT -o/$(MODE)/third_party/python/Lib/test/test_codecmaps_kr.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecmaps_kr.o: private \ PYFLAGS += \ -Y.python/test/CP949.TXT \ -Y.python/test/EUC-KR.TXT \ -Y.python/test/JOHAB.TXT -o/$(MODE)/third_party/python/Lib/test/test_codecmaps_tw.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecmaps_tw.o: private \ PYFLAGS += \ -Y.python/test/BIG5.TXT \ -Y.python/test/CP950.TXT -o/$(MODE)/third_party/python/Lib/test/test_codecencodings_tw.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecencodings_tw.o: private \ PYFLAGS += \ -Y.python/test/cjkencodings/ \ -Y.python/test/cjkencodings/big5-utf8.txt \ -Y.python/test/cjkencodings/big5.txt -o/$(MODE)/third_party/python/Lib/test/test_codecencodings_kr.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecencodings_kr.o: private \ PYFLAGS += \ -Y.python/test/cjkencodings/ \ -Y.python/test/cjkencodings/cp949-utf8.txt \ @@ -4147,7 +4147,7 @@ o/$(MODE)/third_party/python/Lib/test/test_codecencodings_kr.o: \ -Y.python/test/cjkencodings/johab-utf8.txt \ -Y.python/test/cjkencodings/johab.txt -o/$(MODE)/third_party/python/Lib/test/test_codecencodings_jp.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecencodings_jp.o: private \ PYFLAGS += \ -Y.python/test/cjkencodings/ \ -Y.python/test/cjkencodings/euc_jisx0213-utf8.txt \ @@ -4161,7 +4161,7 @@ o/$(MODE)/third_party/python/Lib/test/test_codecencodings_jp.o: \ -Y.python/test/cjkencodings/shift_jisx0213-utf8.txt \ -Y.python/test/cjkencodings/shift_jisx0213.txt -o/$(MODE)/third_party/python/Lib/test/test_codecencodings_iso2022.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecencodings_iso2022.o: private \ PYFLAGS += \ -Y.python/test/cjkencodings/ \ -Y.python/test/cjkencodings/iso2022_jp-utf8.txt \ @@ -4169,13 +4169,13 @@ o/$(MODE)/third_party/python/Lib/test/test_codecencodings_iso2022.o: \ -Y.python/test/cjkencodings/iso2022_kr-utf8.txt \ -Y.python/test/cjkencodings/iso2022_kr.txt -o/$(MODE)/third_party/python/Lib/test/test_codecencodings_hk.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecencodings_hk.o: private \ PYFLAGS += \ -Y.python/test/cjkencodings/ \ -Y.python/test/cjkencodings/big5hkscs-utf8.txt \ -Y.python/test/cjkencodings/big5hkscs.txt -o/$(MODE)/third_party/python/Lib/test/test_codecencodings_cn.o: \ +o/$(MODE)/third_party/python/Lib/test/test_codecencodings_cn.o: private \ PYFLAGS += \ -Y.python/test/cjkencodings/ \ -Y.python/test/cjkencodings/gb18030-utf8.txt \ @@ -4187,13 +4187,13 @@ o/$(MODE)/third_party/python/Lib/test/test_codecencodings_cn.o: \ -Y.python/test/cjkencodings/hz-utf8.txt \ -Y.python/test/cjkencodings/hz.txt -$(THIRD_PARTY_PYTHON_STAGE2_A_PYS_OBJS): PYFLAGS += -P.python -C3 -$(THIRD_PARTY_PYTHON_STAGE2_A_DATA_OBJS): ZIPOBJ_FLAGS += -P.python -C3 -$(THIRD_PARTY_PYTHON_PYTEST_A_PYS_OBJS): PYFLAGS += -P.python -C3 -$(THIRD_PARTY_PYTHON_PYTEST_A_DATA_OBJS): ZIPOBJ_FLAGS += -P.python -C3 +$(THIRD_PARTY_PYTHON_STAGE2_A_PYS_OBJS): private PYFLAGS += -P.python -C3 +$(THIRD_PARTY_PYTHON_STAGE2_A_DATA_OBJS): private ZIPOBJ_FLAGS += -P.python -C3 +$(THIRD_PARTY_PYTHON_PYTEST_A_PYS_OBJS): private PYFLAGS += -P.python -C3 +$(THIRD_PARTY_PYTHON_PYTEST_A_DATA_OBJS): private ZIPOBJ_FLAGS += -P.python -C3 -o/$(MODE)/third_party/python/Python/ceval.o: QUOTA = -C64 -M1024m -L300 -o/$(MODE)/third_party/python/Objects/unicodeobject.o: QUOTA += -C64 -M1024m -L300 +o/$(MODE)/third_party/python/Python/ceval.o: private QUOTA = -C64 -M1024m -L300 +o/$(MODE)/third_party/python/Objects/unicodeobject.o: private QUOTA += -C64 -M1024m -L300 o/$(MODE)/third_party/python/Objects/unicodeobject.o: \ third_party/python/Objects/unicodeobject.c \ @@ -4228,36 +4228,36 @@ o/$(MODE)/third_party/python/Modules/_sre.o: \ third_party/python/Modules/_sre.c \ third_party/python/Modules/clinic/_sre.inc -o/$(MODE)/third_party/python/Parser/asdl_c.o: PYFLAGS += -m -$(THIRD_PARTY_PYTHON_PYTEST_PYMAINS_OBJS): PYFLAGS += -t -P.python -C3 -$(THIRD_PARTY_PYTHON_PYTEST_TODOS:%.py=o/$(MODE)/%.o): PYFLAGS += -t -P.python -C3 -o/$(MODE)/third_party/python/Lib/test/pystone.o: PYFLAGS += -m -O2 -P.python -C4 +o/$(MODE)/third_party/python/Parser/asdl_c.o: private PYFLAGS += -m +$(THIRD_PARTY_PYTHON_PYTEST_PYMAINS_OBJS): private PYFLAGS += -t -P.python -C3 +$(THIRD_PARTY_PYTHON_PYTEST_TODOS:%.py=o/$(MODE)/%.o): private PYFLAGS += -t -P.python -C3 +o/$(MODE)/third_party/python/Lib/test/pystone.o: private PYFLAGS += -m -O2 -P.python -C4 -o/$(MODE)/third_party/python/Lib/test/test_long.py.runs: QUOTA = -C64 -L180 -o/$(MODE)/third_party/python/Lib/test/test_hash.py.runs: QUOTA = -C64 -o/$(MODE)/third_party/python/Lib/test/test_exceptions.py.runs: QUOTA = -C64 -o/$(MODE)/third_party/python/Lib/test/test_tuple.py.runs: QUOTA = -M512m -o/$(MODE)/third_party/python/Lib/test/test_decimal.py.runs: QUOTA = -M512m -C64 -L300 -o/$(MODE)/third_party/python/Lib/test/test_longexp.py.runs: QUOTA = -M1024m -o/$(MODE)/third_party/python/Lib/test/test_unicode.py.runs: QUOTA = -M1400m -L300 -o/$(MODE)/third_party/python/Lib/test/test_unicodedata.py.runs: QUOTA = -C64 -L300 -o/$(MODE)/third_party/python/Lib/test/test_logging.py.runs: QUOTA = -M512m -o/$(MODE)/third_party/python/Lib/test/test_itertools.py.runs: QUOTA = -M1024m -o/$(MODE)/third_party/python/Lib/test/test_tarfile.py.runs: QUOTA = -L300 -C64 -o/$(MODE)/third_party/python/Lib/test/test_sqlite.py.runs: QUOTA = -L120 -o/$(MODE)/third_party/python/Lib/test/test_gzip.py.runs: QUOTA = -L120 -o/$(MODE)/third_party/python/Lib/test/test_logging.py.runs: QUOTA = -M512m -o/$(MODE)/third_party/python/Lib/test/test_resource.py.runs: QUOTA = -C1000000 -o/$(MODE)/third_party/python/Lib/test/test_email/test_email.py.runs: QUOTA = -C32 -M1024m -o/$(MODE)/third_party/python/Lib/test/test_selectors.py.runs: QUOTA = -L180 -o/$(MODE)/third_party/python/Lib/test/test_trace.py.runs: QUOTA = -L300 -o/$(MODE)/third_party/python/Lib/test/test_multibytecodec.py.runs: QUOTA = -L300 -o/$(MODE)/third_party/python/Lib/test/test_bz2.py.runs: QUOTA = -L300 -o/$(MODE)/third_party/python/Lib/test/test_bytes.py.runs: QUOTA = -L300 -o/$(MODE)/third_party/python/Lib/test/test_urlparse.py.runs: QUOTA = -L300 -o/$(MODE)/third_party/python/Modules/_decimal/libmpdec/mpdecimal.o: QUOTA = -L180 -o/$(MODE)/third_party/python/Modules/_sre.o: QUOTA = -L180 -o/dbg/third_party/python/Lib/test/test_set.py.runs: QUOTA = -L300 +o/$(MODE)/third_party/python/Lib/test/test_long.py.runs: private QUOTA = -C64 -L180 +o/$(MODE)/third_party/python/Lib/test/test_hash.py.runs: private QUOTA = -C64 +o/$(MODE)/third_party/python/Lib/test/test_exceptions.py.runs: private QUOTA = -C64 +o/$(MODE)/third_party/python/Lib/test/test_tuple.py.runs: private QUOTA = -M512m +o/$(MODE)/third_party/python/Lib/test/test_decimal.py.runs: private QUOTA = -M512m -C64 -L300 +o/$(MODE)/third_party/python/Lib/test/test_longexp.py.runs: private QUOTA = -M1024m +o/$(MODE)/third_party/python/Lib/test/test_unicode.py.runs: private QUOTA = -M1400m -L300 +o/$(MODE)/third_party/python/Lib/test/test_unicodedata.py.runs: private QUOTA = -C64 -L300 +o/$(MODE)/third_party/python/Lib/test/test_logging.py.runs: private QUOTA = -M512m +o/$(MODE)/third_party/python/Lib/test/test_itertools.py.runs: private QUOTA = -M1024m +o/$(MODE)/third_party/python/Lib/test/test_tarfile.py.runs: private QUOTA = -L300 -C64 +o/$(MODE)/third_party/python/Lib/test/test_sqlite.py.runs: private QUOTA = -L120 +o/$(MODE)/third_party/python/Lib/test/test_gzip.py.runs: private QUOTA = -L120 +o/$(MODE)/third_party/python/Lib/test/test_logging.py.runs: private QUOTA = -M512m +o/$(MODE)/third_party/python/Lib/test/test_resource.py.runs: private QUOTA = -C1000000 +o/$(MODE)/third_party/python/Lib/test/test_email/test_email.py.runs: private QUOTA = -C32 -M1024m +o/$(MODE)/third_party/python/Lib/test/test_selectors.py.runs: private QUOTA = -L180 +o/$(MODE)/third_party/python/Lib/test/test_trace.py.runs: private QUOTA = -L300 +o/$(MODE)/third_party/python/Lib/test/test_multibytecodec.py.runs: private QUOTA = -L300 +o/$(MODE)/third_party/python/Lib/test/test_bz2.py.runs: private QUOTA = -L300 +o/$(MODE)/third_party/python/Lib/test/test_bytes.py.runs: private QUOTA = -L300 +o/$(MODE)/third_party/python/Lib/test/test_urlparse.py.runs: private QUOTA = -L300 +o/$(MODE)/third_party/python/Modules/_decimal/libmpdec/mpdecimal.o: private QUOTA = -L180 +o/$(MODE)/third_party/python/Modules/_sre.o: private QUOTA = -L180 +o/dbg/third_party/python/Lib/test/test_set.py.runs: private QUOTA = -L300 THIRD_PARTY_PYTHON_LIBS = \ $(foreach x,$(THIRD_PARTY_PYTHON_ARTIFACTS),$($(x))) @@ -4474,7 +4474,7 @@ o/$(MODE)/third_party/python/hello.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(THIRD_PARTY_PYTHON_HELLO_OBJS): PYFLAGS += -C2 -m +$(THIRD_PARTY_PYTHON_HELLO_OBJS): private PYFLAGS += -C2 -m ################################################################################ diff --git a/third_party/quickjs/quickjs.mk b/third_party/quickjs/quickjs.mk index a7e5611a7..be54ea286 100644 --- a/third_party/quickjs/quickjs.mk +++ b/third_party/quickjs/quickjs.mk @@ -176,27 +176,27 @@ o/$(MODE)/third_party/quickjs/unicode_gen.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(THIRD_PARTY_QUICKJS_OBJS): \ +$(THIRD_PARTY_QUICKJS_OBJS): private \ OVERRIDE_CPPFLAGS += \ -DCONFIG_BIGNUM \ -DCONFIG_VERSION=\"2021-03-27\" -o/tiny/third_party/quickjs/call.o: \ +o/tiny/third_party/quickjs/call.o: private \ OVERRIDE_CFLAGS += \ -O2 -o/$(MODE)/third_party/quickjs/unicode_gen.o: \ +o/$(MODE)/third_party/quickjs/unicode_gen.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED # TODO(jart): Replace alloca() calls with malloc(). o/$(MODE)/third_party/quickjs/libregexp.o \ -o/$(MODE)/third_party/quickjs/quickjs.o: \ +o/$(MODE)/third_party/quickjs/quickjs.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED -o/$(MODE)/third_party/quickjs/call.o: QUOTA = -M1024m -C32 -L180 -o/$(MODE)/third_party/quickjs/quickjs.o: QUOTA = -M512m -C32 -L180 +o/$(MODE)/third_party/quickjs/call.o: private QUOTA = -M1024m -C32 -L180 +o/$(MODE)/third_party/quickjs/quickjs.o: private QUOTA = -M512m -C32 -L180 .PHONY: o/$(MODE)/third_party/quickjs o/$(MODE)/third_party/quickjs: \ diff --git a/third_party/regex/regex.mk b/third_party/regex/regex.mk index b98403c39..0cb64bcd8 100644 --- a/third_party/regex/regex.mk +++ b/third_party/regex/regex.mk @@ -51,7 +51,7 @@ $(THIRD_PARTY_REGEX_OBJS): third_party/regex/regex.mk o/$(MODE)/third_party/regex/regcomp.o \ o/$(MODE)/third_party/regex/regexec.o \ -o/$(MODE)/third_party/regex/tre-mem.o: \ +o/$(MODE)/third_party/regex/tre-mem.o: private \ OVERRIDE_CFLAGS += \ $(OLD_CODE) diff --git a/third_party/sqlite3/sqlite3.mk b/third_party/sqlite3/sqlite3.mk index ab94168cc..eb110bf3d 100644 --- a/third_party/sqlite3/sqlite3.mk +++ b/third_party/sqlite3/sqlite3.mk @@ -121,12 +121,12 @@ THIRD_PARTY_SQLITE3_FLAGS = \ -DSQLITE_ENABLE_MATH_FUNCTIONS \ -DSQLITE_ENABLE_JSON1 \ -$(THIRD_PARTY_SQLITE3_A_OBJS): \ +$(THIRD_PARTY_SQLITE3_A_OBJS): private \ OVERRIDE_CFLAGS += \ $(THIRD_PARTY_SQLITE3_FLAGS) \ -DSQLITE_OMIT_UPDATE_HOOK -$(THIRD_PARTY_SQLITE3_SHELL_OBJS): \ +$(THIRD_PARTY_SQLITE3_SHELL_OBJS): private \ OVERRIDE_CFLAGS += \ $(THIRD_PARTY_SQLITE3_FLAGS) \ -DHAVE_READLINE=0 \ @@ -154,16 +154,16 @@ $(THIRD_PARTY_SQLITE3_SHELL_OBJS): \ o//third_party/sqlite3/parse.o \ o//third_party/sqlite3/select.o \ o//third_party/sqlite3/pragma.o \ -o//third_party/sqlite3/vdbe.o: \ +o//third_party/sqlite3/vdbe.o: private \ OVERRIDE_CFLAGS += \ -Os -o/$(MODE)/third_party/sqlite3/shell.o: \ +o/$(MODE)/third_party/sqlite3/shell.o: private \ OVERRIDE_CFLAGS += \ -DSTACK_FRAME_UNLIMITED $(THIRD_PARTY_SQLITE3_A_OBJS) \ -$(THIRD_PARTY_SQLITE3_SHELL_OBJS): \ +$(THIRD_PARTY_SQLITE3_SHELL_OBJS): private \ OVERRIDE_CFLAGS += \ -fdata-sections \ -ffunction-sections @@ -171,15 +171,15 @@ $(THIRD_PARTY_SQLITE3_SHELL_OBJS): \ # use smaller relocations for indirect branches o/$(MODE)/third_party/sqlite3/expr.o \ o/$(MODE)/third_party/sqlite3/printf.o \ -o/$(MODE)/third_party/sqlite3/parse.o: \ +o/$(MODE)/third_party/sqlite3/parse.o: private \ OVERRIDE_CFLAGS += \ -fpie -o/$(MODE)/third_party/sqlite3/shell.o: QUOTA = -M512m -C16 -L180 -o/$(MODE)/third_party/sqlite3/vdbe.o: QUOTA = -M1024m -o/$(MODE)/third_party/sqlite3/vdbe.shell.o: QUOTA = -M1024m -o/$(MODE)/third_party/sqlite3/fts5.o: QUOTA = -M512m -C16 -o/$(MODE)/third_party/sqlite3/fts5.shell.o: QUOTA = -M512m -C16 -L180 +o/$(MODE)/third_party/sqlite3/shell.o: private QUOTA = -M512m -C16 -L180 +o/$(MODE)/third_party/sqlite3/vdbe.o: private QUOTA = -M1024m +o/$(MODE)/third_party/sqlite3/vdbe.shell.o: private QUOTA = -M1024m +o/$(MODE)/third_party/sqlite3/fts5.o: private QUOTA = -M512m -C16 +o/$(MODE)/third_party/sqlite3/fts5.shell.o: private QUOTA = -M512m -C16 -L180 o/$(MODE)/third_party/sqlite3/rtree.o: \ third_party/sqlite3/rtree.c \ diff --git a/third_party/stb/stb.mk b/third_party/stb/stb.mk index eceace19f..775b881b2 100644 --- a/third_party/stb/stb.mk +++ b/third_party/stb/stb.mk @@ -57,16 +57,16 @@ $(THIRD_PARTY_STB_A).pkg: \ $(THIRD_PARTY_STB_A_OBJS) \ $(foreach x,$(THIRD_PARTY_STB_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_STB_A_OBJS): \ +$(THIRD_PARTY_STB_A_OBJS): private \ OVERRIDE_CFLAGS += \ -ffunction-sections \ -fdata-sections -$(THIRD_PARTY_STB_A_OBJS): \ +$(THIRD_PARTY_STB_A_OBJS): private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED -o/$(MODE)/third_party/stb/stb_truetype.o: \ +o/$(MODE)/third_party/stb/stb_truetype.o: private \ OVERRIDE_CFLAGS += \ -Os diff --git a/third_party/tidy/tidy.mk b/third_party/tidy/tidy.mk index 5dfafa666..82b4fee99 100644 --- a/third_party/tidy/tidy.mk +++ b/third_party/tidy/tidy.mk @@ -54,8 +54,7 @@ o/$(MODE)/third_party/tidy/tidy.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/third_party/tidy/.tidyrc.zip.o: third_party/tidy/.tidyrc - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< +o/$(MODE)/third_party/tidy/.tidyrc.zip.o: private ZIPOBJ_FLAGS += -B THIRD_PARTY_TIDY_COMS = \ o/$(MODE)/third_party/tidy/tidy.com diff --git a/third_party/unzip/unzip.mk b/third_party/unzip/unzip.mk index 982e6a656..906ae6ad7 100644 --- a/third_party/unzip/unzip.mk +++ b/third_party/unzip/unzip.mk @@ -51,7 +51,7 @@ o/$(MODE)/third_party/unzip/unzip.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(THIRD_PARTY_UNZIP_A_OBJS): \ +$(THIRD_PARTY_UNZIP_A_OBJS): private \ OVERRIDE_CPPFLAGS += \ -DUSE_BZIP2 \ -DUNICODE_SUPPORT \ diff --git a/third_party/xed/xed.mk b/third_party/xed/xed.mk index 26791595e..3fe120a64 100644 --- a/third_party/xed/xed.mk +++ b/third_party/xed/xed.mk @@ -40,7 +40,7 @@ THIRD_PARTY_XED_A_DIRECTDEPS = \ THIRD_PARTY_XED_A_DEPS := \ $(call uniq,$(foreach x,$(THIRD_PARTY_XED_A_DIRECTDEPS),$($(x)))) -o/$(MODE)/third_party/xed/x86ild.greg.o: \ +o/$(MODE)/third_party/xed/x86ild.greg.o: private \ OVERRIDE_CFLAGS += \ -mstringop-strategy=unrolled_loop @@ -53,7 +53,7 @@ $(THIRD_PARTY_XED_A).pkg: \ $(THIRD_PARTY_XED_A_OBJS) \ $(foreach x,$(THIRD_PARTY_XED_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/third_party/xed/x86ild.greg.o: \ +o/$(MODE)/third_party/xed/x86ild.greg.o: private \ OVERRIDE_CFLAGS += \ -O3 diff --git a/third_party/zip/zip.mk b/third_party/zip/zip.mk index 832cefee2..493e369af 100644 --- a/third_party/zip/zip.mk +++ b/third_party/zip/zip.mk @@ -152,7 +152,7 @@ o/$(MODE)/third_party/zip/zipfile.o \ o/$(MODE)/third_party/zip/zipfile_.o \ o/$(MODE)/third_party/zip/zipnote.o \ o/$(MODE)/third_party/zip/zipsplit.o \ -o/$(MODE)/third_party/zip/zipup.o: \ +o/$(MODE)/third_party/zip/zipup.o: private \ OVERRIDE_CPPFLAGS += \ -DUNIX \ -DMMAP \ @@ -167,7 +167,7 @@ o/$(MODE)/third_party/zip/zipup.o: \ o/$(MODE)/third_party/zip/zip.o \ o/$(MODE)/third_party/zip/zipsplit.o \ o/$(MODE)/third_party/zip/fileio.o \ -o/$(MODE)/third_party/zip/fileio_.o: \ +o/$(MODE)/third_party/zip/fileio_.o: private \ OVERRIDE_CPPFLAGS += \ -DSTACK_FRAME_UNLIMITED diff --git a/third_party/zlib/gz/gz.mk b/third_party/zlib/gz/gz.mk index 306d14d3f..28ae2467e 100644 --- a/third_party/zlib/gz/gz.mk +++ b/third_party/zlib/gz/gz.mk @@ -40,7 +40,7 @@ $(THIRD_PARTY_ZLIB_GZ_A).pkg: \ $(THIRD_PARTY_ZLIB_GZ_A_OBJS) \ $(foreach x,$(THIRD_PARTY_ZLIB_GZ_A_DIRECTDEPS),$($(x)_A).pkg) -$(THIRD_PARTY_ZLIB_GZ_OBJS): \ +$(THIRD_PARTY_ZLIB_GZ_OBJS): private \ OVERRIDE_CFLAGS += \ -ffunction-sections \ -fdata-sections diff --git a/third_party/zlib/zlib.mk b/third_party/zlib/zlib.mk index fd38e8bba..352a6b150 100644 --- a/third_party/zlib/zlib.mk +++ b/third_party/zlib/zlib.mk @@ -41,18 +41,18 @@ $(THIRD_PARTY_ZLIB_A).pkg: \ $(THIRD_PARTY_ZLIB_A_OBJS) \ $(foreach x,$(THIRD_PARTY_ZLIB_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/third_party/zlib/adler32simd.o: \ +o/$(MODE)/third_party/zlib/adler32simd.o: private \ OVERRIDE_CFLAGS += \ -mssse3 -o/$(MODE)/third_party/zlib/crcfold.o: \ +o/$(MODE)/third_party/zlib/crcfold.o: private \ OVERRIDE_CFLAGS += \ -mpclmul \ -mssse3 o/$(MODE)/third_party/zlib/deflate.o \ o/$(MODE)/third_party/zlib/inflate.o \ -o/$(MODE)/third_party/zlib/adler32.o: \ +o/$(MODE)/third_party/zlib/adler32.o: private \ OVERRIDE_CFLAGS += \ -ffunction-sections \ -fdata-sections diff --git a/tool/build/build.mk b/tool/build/build.mk index 58ea370e8..cbb1ceaa5 100644 --- a/tool/build/build.mk +++ b/tool/build/build.mk @@ -7,7 +7,19 @@ TOOL_BUILD_FILES := $(wildcard tool/build/*) TOOL_BUILD_SRCS = $(filter %.c,$(TOOL_BUILD_FILES)) TOOL_BUILD_HDRS = $(filter %.h,$(TOOL_BUILD_FILES)) TOOL_BUILD_CTESTS = $(filter %.ctest,$(TOOL_BUILD_FILES)) -TOOL_BUILD_BINS = $(TOOL_BUILD_COMS) $(TOOL_BUILD_COMS:%=%.dbg) + +TOOL_BUILD_BINS = \ + $(TOOL_BUILD_COMS) \ + $(TOOL_BUILD_COMS:%=%.dbg) \ + o/$(MODE)/tool/build/mkdir \ + o/$(MODE)/tool/build/chmod \ + o/$(MODE)/tool/build/cp \ + o/$(MODE)/tool/build/mv \ + o/$(MODE)/tool/build/echo \ + o/$(MODE)/tool/build/gzip \ + o/$(MODE)/tool/build/printf \ + o/$(MODE)/tool/build/dd + TOOL_BUILD_CALCULATOR = o/$(MODE)/tool/build/calculator.com TOOL_BUILD_OBJS = \ @@ -85,30 +97,25 @@ o/$(MODE)/tool/build/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/tool/build/emulator.o: \ +o/$(MODE)/tool/build/emulator.o: private \ OVERRIDE_COPTS += \ -fno-sanitize=pointer-overflow -o/$(MODE)/tool/build/mkdir.zip.o: o/$(MODE)/tool/build/mkdir - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -0 -B -Pbin $(OUTPUT_OPTION) $< -o/$(MODE)/tool/build/chmod.zip.o: o/$(MODE)/tool/build/chmod - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -0 -B -Pbin $(OUTPUT_OPTION) $< -o/$(MODE)/tool/build/cp.zip.o: o/$(MODE)/tool/build/cp - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -0 -B -Pbin $(OUTPUT_OPTION) $< -o/$(MODE)/tool/build/mv.zip.o: o/$(MODE)/tool/build/mv - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -0 -B -Pbin $(OUTPUT_OPTION) $< -o/$(MODE)/tool/build/echo.zip.o: o/$(MODE)/tool/build/echo - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -0 -B -Pbin $(OUTPUT_OPTION) $< -o/$(MODE)/tool/build/gzip.zip.o: o/$(MODE)/tool/build/gzip - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -0 -B -Pbin $(OUTPUT_OPTION) $< -o/$(MODE)/tool/build/printf.zip.o: o/$(MODE)/tool/build/printf - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -0 -B -Pbin $(OUTPUT_OPTION) $< -o/$(MODE)/tool/build/dd.zip.o: o/$(MODE)/tool/build/dd - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -0 -B -Pbin $(OUTPUT_OPTION) $< +o/$(MODE)/tool/build/dso/sandbox.so.zip.o \ +o/$(MODE)/tool/build/mkdir.zip.o \ +o/$(MODE)/tool/build/chmod.zip.o \ +o/$(MODE)/tool/build/cp.zip.o \ +o/$(MODE)/tool/build/mv.zip.o \ +o/$(MODE)/tool/build/echo.zip.o \ +o/$(MODE)/tool/build/gzip.zip.o \ +o/$(MODE)/tool/build/printf.zip.o \ +o/$(MODE)/tool/build/dd.zip.o: private \ + ZIPOBJ_FLAGS += \ + -B # we need pic because: # so it can be an LD_PRELOAD payload -o/$(MODE)/tool/build/dso/sandbox.o: \ +o/$(MODE)/tool/build/dso/sandbox.o: private \ OVERRIDE_CFLAGS += \ -fPIC @@ -125,7 +132,9 @@ o/$(MODE)/tool/build/dso/sandbox.so: \ o/$(MODE)/tool/build/dso/sandbox.o \ o/$(MODE)/libc/calls/pledge-linux.o \ o/$(MODE)/libc/sysv/restorert.o - @$(CC) -s \ + @$(COMPILE) -ALINK.so \ + $(CC) \ + -s \ -shared \ -nostdlib \ -Wl,--gc-sections \ @@ -134,10 +143,6 @@ o/$(MODE)/tool/build/dso/sandbox.so: \ o/$(MODE)/libc/sysv/restorert.o \ $(OUTPUT_OPTION) -o/$(MODE)/tool/build/dso/sandbox.so.zip.o: \ - o/$(MODE)/tool/build/dso/sandbox.so - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< - o/$(MODE)/tool/build/pledge.com.dbg: \ $(TOOL_BUILD_DEPS) \ o/$(MODE)/tool/build/build.pkg \ diff --git a/tool/build/emubin/emubin.mk b/tool/build/emubin/emubin.mk index 968c9c8ac..7edf60f17 100644 --- a/tool/build/emubin/emubin.mk +++ b/tool/build/emubin/emubin.mk @@ -60,7 +60,7 @@ o/tiny/tool/build/emubin/mdatest.bin.dbg: \ o/tiny/tool/build/emubin/mdatest.real.o @$(ELFLINK) -z max-page-size=0x10 -T tool/build/emucrt/real.lds -$(TOOL_BUILD_EMUBIN_OBJS): \ +$(TOOL_BUILD_EMUBIN_OBJS): private \ OVERRIDE_CFLAGS += \ $(NO_MAGIC) diff --git a/tool/build/lib/buildlib.mk b/tool/build/lib/buildlib.mk index d8a2ac7b8..e667b43b7 100644 --- a/tool/build/lib/buildlib.mk +++ b/tool/build/lib/buildlib.mk @@ -71,7 +71,7 @@ $(TOOL_BUILD_LIB_A).pkg: \ $(TOOL_BUILD_LIB_A_OBJS) \ $(foreach x,$(TOOL_BUILD_LIB_A_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/tool/build/lib/ssefloat.o: \ +o/$(MODE)/tool/build/lib/ssefloat.o: private \ TARGET_ARCH += \ -msse3 @@ -89,13 +89,10 @@ o/$(MODE)/tool/build/lib/apetest2.com.dbg: \ $(APE_COPY_SELF) @$(APELINK) -o/$(MODE)/tool/build/lib/apetest.com.zip.o: \ - o/$(MODE)/tool/build/lib/apetest.com - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< - -o/$(MODE)/tool/build/lib/apetest2.com.zip.o: \ - o/$(MODE)/tool/build/lib/apetest2.com - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< +o/$(MODE)/tool/build/lib/apetest.com.zip.o \ +o/$(MODE)/tool/build/lib/apetest2.com.zip.o: private \ + ZIPOBJ_FLAGS += \ + -B o/$(MODE)/tool/build/lib/apetest.o: \ tool/build/lib/apetest.c \ diff --git a/tool/decode/lib/decodelib.mk b/tool/decode/lib/decodelib.mk index 972378c65..7bb5451eb 100644 --- a/tool/decode/lib/decodelib.mk +++ b/tool/decode/lib/decodelib.mk @@ -54,7 +54,7 @@ TOOL_DECODE_LIB_TESTS = $(foreach x,$(TOOL_DECODE_LIB_ARTIFACTS),$($(x)_TESTS)) o/$(MODE)/tool/decode/lib/elfidnames.o \ o/$(MODE)/tool/decode/lib/machoidnames.o \ -o/$(MODE)/tool/decode/lib/peidnames.o: \ +o/$(MODE)/tool/decode/lib/peidnames.o: private \ DEFAULT_CFLAGS += \ -fdata-sections diff --git a/tool/lambda/lambda.mk b/tool/lambda/lambda.mk index c7ede2705..034da7a6b 100644 --- a/tool/lambda/lambda.mk +++ b/tool/lambda/lambda.mk @@ -47,7 +47,7 @@ o/$(MODE)/tool/lambda/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/tool/lambda/tromp.o: \ +o/$(MODE)/tool/lambda/tromp.o: private \ OVERRIDE_CFLAGS += \ -w diff --git a/tool/net/net.mk b/tool/net/net.mk index 95e5d6a71..4ed1e008a 100644 --- a/tool/net/net.mk +++ b/tool/net/net.mk @@ -153,21 +153,21 @@ o/$(MODE)/tool/net/demo/redbean-xhr.lua.zip.o \ o/$(MODE)/tool/net/redbean.png.zip.o \ o/$(MODE)/tool/net/favicon.ico.zip.o \ o/$(MODE)/tool/net/help.txt.zip.o \ -o/$(MODE)/tool/net/demo/404.html.zip.o: \ +o/$(MODE)/tool/net/demo/404.html.zip.o: private \ ZIPOBJ_FLAGS += \ -B o/$(MODE)/tool/net/demo/.lua/.zip.o \ -o/$(MODE)/tool/net/demo/.lua/mymodule.lua.zip.o: \ +o/$(MODE)/tool/net/demo/.lua/mymodule.lua.zip.o: private \ ZIPOBJ_FLAGS += \ -C3 -o/$(MODE)/tool/net/demo/seekable.txt.zip.o: \ +o/$(MODE)/tool/net/demo/seekable.txt.zip.o: private \ ZIPOBJ_FLAGS += \ -B \ -0 -o/$(MODE)/tool/net/demo/virtualbean.html.zip.o: \ +o/$(MODE)/tool/net/demo/virtualbean.html.zip.o: private \ ZIPOBJ_FLAGS += \ -Predbean.justine.lol \ -B diff --git a/tool/plinko/lib/lib.mk b/tool/plinko/lib/lib.mk index 58c546f32..03dd22203 100644 --- a/tool/plinko/lib/lib.mk +++ b/tool/plinko/lib/lib.mk @@ -53,14 +53,14 @@ $(TOOL_PLINKO_LIB_A).pkg: \ $(foreach x,$(TOOL_PLINKO_LIB_A_DIRECTDEPS),$($(x)_A).pkg) ifeq ($(MODE),) -$(TOOL_PLINKO_LIB_A_OBJS): OVERRIDE_CFLAGS += -fno-inline +$(TOOL_PLINKO_LIB_A_OBJS): private OVERRIDE_CFLAGS += -fno-inline endif ifeq ($(MODE),dbg) -$(TOOL_PLINKO_LIB_A_OBJS): OVERRIDE_CFLAGS += -fno-inline +$(TOOL_PLINKO_LIB_A_OBJS): private OVERRIDE_CFLAGS += -fno-inline endif -$(TOOL_PLINKO_LIB_A_OBJS): OVERRIDE_CFLAGS += -ffast-math -foptimize-sibling-calls -O2 +$(TOOL_PLINKO_LIB_A_OBJS): private OVERRIDE_CFLAGS += -ffast-math -foptimize-sibling-calls -O2 TOOL_PLINKO_LIB_LIBS = $(foreach x,$(TOOL_PLINKO_LIB_ARTIFACTS),$($(x))) TOOL_PLINKO_LIB_SRCS = $(foreach x,$(TOOL_PLINKO_LIB_ARTIFACTS),$($(x)_SRCS)) diff --git a/tool/plinko/plinko.mk b/tool/plinko/plinko.mk index 46b2f8219..623e6f70b 100644 --- a/tool/plinko/plinko.mk +++ b/tool/plinko/plinko.mk @@ -46,10 +46,10 @@ o/$(MODE)/tool/plinko/%.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -$(TOOL_PLINKO_OBJS): \ - $(BUILD_FILES) \ - tool/plinko/plinko.mk +o/$(MODE)/tool/plinko/plinko.com.zip.o: \ + o/$(MODE)/tool/plinko/plinko.com +o/$(MODE)/tool/plinko/plinko.com.zip.o \ o/$(MODE)/tool/plinko/lib/library.lisp.zip.o \ o/$(MODE)/tool/plinko/lib/binarytrees.lisp.zip.o \ o/$(MODE)/tool/plinko/lib/algebra.lisp.zip.o \ @@ -58,10 +58,6 @@ o/$(MODE)/tool/plinko/lib/ok.lisp.zip.o: \ ZIPOBJ_FLAGS += \ -B -o/$(MODE)/tool/plinko/plinko.com.zip.o: \ - o/$(MODE)/tool/plinko/plinko.com - @$(COMPILE) -AZIPOBJ $(ZIPOBJ) $(ZIPOBJ_FLAGS) -B $(OUTPUT_OPTION) $< - .PHONY: o/$(MODE)/tool/plinko o/$(MODE)/tool/plinko: $(TOOL_PLINKO_BINS) $(TOOL_PLINKO_CHECKS) diff --git a/tool/viz/lib/vizlib.mk b/tool/viz/lib/vizlib.mk index 3f7d1ccac..4a6013713 100644 --- a/tool/viz/lib/vizlib.mk +++ b/tool/viz/lib/vizlib.mk @@ -51,7 +51,7 @@ TOOL_VIZ_LIB_A_DIRECTDEPS = \ TOOL_VIZ_LIB_A_DEPS := \ $(call uniq,$(foreach x,$(TOOL_VIZ_LIB_A_DIRECTDEPS),$($(x)))) -o/$(MODE)/tool/viz/lib/pmaddubsw.o: \ +o/$(MODE)/tool/viz/lib/pmaddubsw.o: private \ OVERRIDE_CFLAGS += \ -fvect-cost-model=unlimited @@ -71,12 +71,12 @@ o/$(MODE)/tool/viz/lib/emboss.o \ o/$(MODE)/tool/viz/lib/getxtermcodes.o \ o/$(MODE)/tool/viz/lib/lingamma.o \ o/$(MODE)/tool/viz/lib/perlin3.o \ -o/$(MODE)/tool/viz/lib/resizegraphic.o: \ +o/$(MODE)/tool/viz/lib/resizegraphic.o: private \ OVERRIDE_CFLAGS += \ -DSTACK_FRAME_UNLIMITED \ $(MATHEMATICAL) -o/$(MODE)/tool/viz/lib/printmatrix.o: \ +o/$(MODE)/tool/viz/lib/printmatrix.o: private \ OVERRIDE_CFLAGS += \ $(IEEE_MATH) diff --git a/tool/viz/viz.mk b/tool/viz/viz.mk index bdddc25bb..ed6677ee3 100644 --- a/tool/viz/viz.mk +++ b/tool/viz/viz.mk @@ -82,12 +82,12 @@ o/$(MODE)/tool/viz/printimage.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) -o/$(MODE)/tool/viz/derasterize.o: \ +o/$(MODE)/tool/viz/derasterize.o: private \ OVERRIDE_CFLAGS += \ -DSTACK_FRAME_UNLIMITED \ $(MATHEMATICAL) -o/$(MODE)/tool/viz/magikarp.o: \ +o/$(MODE)/tool/viz/magikarp.o: private \ OVERRIDE_CFLAGS += \ $(MATHEMATICAL)