mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-21 01:50:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use private keyword on makefile target variables

Browse source
This commit is contained in:
Justine Tunney 2022-08-10 18:00:45 -07:00
parent e015defa70
commit 7b993d561c
71 changed files with 305 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

53
tool/build/build.mk
View file

@ -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 \

2
tool/build/emubin/emubin.mk
View file

@ -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)

13
tool/build/lib/buildlib.mk
View file

@ -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 \

2
tool/decode/lib/decodelib.mk
View file

@ -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

2
tool/lambda/lambda.mk
View file

@ -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

8
tool/net/net.mk
View file

@ -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

6
tool/plinko/lib/lib.mk
View file

@ -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))

10
tool/plinko/plinko.mk
View file

@ -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)

6
tool/viz/lib/vizlib.mk
View file

@ -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)

4
tool/viz/viz.mk
View file

@ -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)