mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-01-31 11:37:35 +00:00
133c693650
This change fixes Landlock Make so that only the output target file is unveiled, rather than unveiling the directory that contains it. This gives us a much stronger sandbox. It also helped identify problematic build code in our repo that should have been using o/tmp instead. Landlock isn't able to let us unveil files that don't exist. Even if they do, then once a file is deleted, the sandboxing for it goes away. This caused problems for Landlock Make because tools like GNU LD will repeatedly delete and recreate the output file. This change uses the compile.com wrapper to ensure on changes happen to the output inode. New binary available on https://justine.lol/make/ Fixes #528
113 lines
3.8 KiB
Makefile
113 lines
3.8 KiB
Makefile
#-*-mode:makefile-gmake;indent-tabs-mode:t;tab-width:8;coding:utf-8-*-┐
|
|
#───vi: set et ft=make ts=8 tw=8 fenc=utf-8 :vi───────────────────────┘
|
|
#
|
|
# SYNOPSIS
|
|
#
|
|
# C Compiler
|
|
#
|
|
# OVERVIEW
|
|
#
|
|
# This makefile compiles and runs each test twice. The first with
|
|
# GCC-built chibicc, and a second time with chibicc-built chibicc
|
|
|
|
CHIBICC = o/$(MODE)/third_party/chibicc/chibicc.com
|
|
CHIBICC_FLAGS = \
|
|
-fno-common \
|
|
-include libc/integral/normalize.inc \
|
|
-DIMAGE_BASE_VIRTUAL=$(IMAGE_BASE_VIRTUAL) \
|
|
-DMODE='"$(MODE)"'
|
|
|
|
PKGS += THIRD_PARTY_CHIBICC
|
|
THIRD_PARTY_CHIBICC_ARTIFACTS += THIRD_PARTY_CHIBICC_A
|
|
THIRD_PARTY_CHIBICC = $(THIRD_PARTY_CHIBICC_A_DEPS) $(THIRD_PARTY_CHIBICC_A)
|
|
THIRD_PARTY_CHIBICC_A = o/$(MODE)/third_party/chibicc/chibicc.a
|
|
THIRD_PARTY_CHIBICC_A_FILES := $(wildcard third_party/chibicc/*)
|
|
THIRD_PARTY_CHIBICC_A_HDRS = $(filter %.h,$(THIRD_PARTY_CHIBICC_A_FILES))
|
|
THIRD_PARTY_CHIBICC_A_SRCS = $(filter %.c,$(THIRD_PARTY_CHIBICC_A_FILES))
|
|
THIRD_PARTY_CHIBICC_A_INCS = $(filter %.inc,$(THIRD_PARTY_CHIBICC_A_FILES))
|
|
|
|
THIRD_PARTY_CHIBICC_DEFINES = \
|
|
-DCRT=\"$(CRT)\" \
|
|
-DAPE=\"o/$(MODE)/ape/ape.o\" \
|
|
-DLDS=\"o/$(MODE)/ape/ape.lds\"
|
|
|
|
THIRD_PARTY_CHIBICC_BINS = \
|
|
o/$(MODE)/third_party/chibicc/chibicc.com.dbg \
|
|
o/$(MODE)/third_party/chibicc/chibicc.com
|
|
|
|
THIRD_PARTY_CHIBICC_A_OBJS = \
|
|
$(THIRD_PARTY_CHIBICC_A_SRCS:%.c=o/$(MODE)/%.o)
|
|
|
|
THIRD_PARTY_CHIBICC_A_CHECKS = \
|
|
$(THIRD_PARTY_CHIBICC_A).pkg \
|
|
$(THIRD_PARTY_CHIBICC_A_HDRS:%=o/$(MODE)/%.ok)
|
|
|
|
THIRD_PARTY_CHIBICC_A_DIRECTDEPS = \
|
|
LIBC_ALG \
|
|
LIBC_BITS \
|
|
LIBC_CALLS \
|
|
LIBC_FMT \
|
|
LIBC_INTRIN \
|
|
LIBC_LOG \
|
|
LIBC_LOG \
|
|
LIBC_MEM \
|
|
LIBC_NEXGEN32E \
|
|
LIBC_RUNTIME \
|
|
LIBC_STDIO \
|
|
LIBC_STR \
|
|
LIBC_STUBS \
|
|
LIBC_SYSV \
|
|
LIBC_TIME \
|
|
LIBC_UNICODE \
|
|
LIBC_X \
|
|
THIRD_PARTY_COMPILER_RT \
|
|
THIRD_PARTY_DLMALLOC \
|
|
TOOL_BUILD_LIB \
|
|
THIRD_PARTY_GDTOA
|
|
|
|
THIRD_PARTY_CHIBICC_A_DEPS := \
|
|
$(call uniq,$(foreach x,$(THIRD_PARTY_CHIBICC_A_DIRECTDEPS),$($(x))))
|
|
|
|
$(THIRD_PARTY_CHIBICC_A): \
|
|
third_party/chibicc/ \
|
|
$(THIRD_PARTY_CHIBICC_A).pkg \
|
|
$(THIRD_PARTY_CHIBICC_A_OBJS)
|
|
$(THIRD_PARTY_CHIBICC_A).pkg: \
|
|
$(THIRD_PARTY_CHIBICC_A_OBJS) \
|
|
$(foreach x,$(THIRD_PARTY_CHIBICC_A_DIRECTDEPS),$($(x)_A).pkg)
|
|
|
|
o/$(MODE)/third_party/chibicc/chibicc.com.dbg: \
|
|
$(THIRD_PARTY_CHIBICC_A_DEPS) \
|
|
$(THIRD_PARTY_CHIBICC_A) \
|
|
$(APE_NO_MODIFY_SELF) \
|
|
$(CRT) \
|
|
o/$(MODE)/third_party/chibicc/help.txt.zip.o \
|
|
o/$(MODE)/third_party/chibicc/chibicc.main.o \
|
|
$(THIRD_PARTY_CHIBICC_A).pkg
|
|
@$(APELINK)
|
|
|
|
o/$(MODE)/third_party/chibicc/as.com.dbg: \
|
|
$(THIRD_PARTY_CHIBICC_A_DEPS) \
|
|
$(THIRD_PARTY_CHIBICC_A) \
|
|
$(APE_NO_MODIFY_SELF) \
|
|
$(CRT) \
|
|
o/$(MODE)/third_party/chibicc/as.main.o \
|
|
$(THIRD_PARTY_CHIBICC_A).pkg
|
|
@$(APELINK)
|
|
|
|
o/$(MODE)/third_party/chibicc/chibicc.o: \
|
|
OVERRIDE_CPPFLAGS += $(THIRD_PARTY_CHIBICC_DEFINES)
|
|
|
|
THIRD_PARTY_CHIBICC_LIBS = $(foreach x,$(THIRD_PARTY_CHIBICC_ARTIFACTS),$($(x)))
|
|
THIRD_PARTY_CHIBICC_SRCS = $(foreach x,$(THIRD_PARTY_CHIBICC_ARTIFACTS),$($(x)_SRCS))
|
|
THIRD_PARTY_CHIBICC_HDRS = $(foreach x,$(THIRD_PARTY_CHIBICC_ARTIFACTS),$($(x)_HDRS))
|
|
THIRD_PARTY_CHIBICC_INCS = $(foreach x,$(THIRD_PARTY_CHIBICC_ARTIFACTS),$($(x)_INCS))
|
|
THIRD_PARTY_CHIBICC_CHECKS = $(foreach x,$(THIRD_PARTY_CHIBICC_ARTIFACTS),$($(x)_CHECKS))
|
|
THIRD_PARTY_CHIBICC_OBJS = $(foreach x,$(THIRD_PARTY_CHIBICC_ARTIFACTS),$($(x)_OBJS))
|
|
$(THIRD_PARTY_CHIBICC_OBJS): $(BUILD_FILES) third_party/chibicc/chibicc.mk
|
|
|
|
.PHONY: o/$(MODE)/third_party/chibicc
|
|
o/$(MODE)/third_party/chibicc: \
|
|
o/$(MODE)/third_party/chibicc/test \
|
|
$(THIRD_PARTY_CHIBICC_BINS) \
|
|
$(THIRD_PARTY_CHIBICC_CHECKS)
|