The unpac monorepo manager self-hosting as a monorepo using unpac
Remove C compilation from Makefile.common
+11
-7
+4
-1
Makefile
+4
-1
Makefile
···
1514
1514
# (without the extension, which is added by the macro)
1515
1515
define COMPILE_C_FILE
1516
1516
ifeq "$(COMPUTE_DEPS)" "true"
1517
-
ifneq "$(1)" "%"
1517
+
ifneq "$(if $(3),%,$(1))" "%"
1518
1518
# -MG would ensure that the dependencies are generated even if the files listed
1519
1519
# in $$(runtime_BUILT_HEADERS) haven't been assembled yet. However,
1520
1520
# this goes subtly wrong if the user has the headers installed,
···
1556
1556
$(foreach runtime_OBJECT_TYPE,$(subst %,,$(runtime_OBJECT_TYPES)), \
1557
1557
$(eval \
1558
1558
runtime/dynlink$(runtime_OBJECT_TYPE).$(O): $(ROOTDIR)/Makefile.config))
1559
+
1560
+
$(eval $(call COMPILE_C_FILE,yacc/%,yacc/%,no-deps))
1559
1561
1560
1562
## Compilation of runtime assembly files
1561
1563
···
2276
2278
endif
2277
2279
2278
2280
# Check that the stack limit is reasonable (Unix-only)
2281
+
$(eval $(call COMPILE_C_FILE,tools/checkstack,tools/checkstack,no-deps))
2279
2282
.PHONY: checkstack
2280
2283
ifeq "$(UNIX_OR_WIN32)" "unix"
2281
2284
checkstack: tools/checkstack$(EXE)
+3
-6
Makefile.common
+3
-6
Makefile.common
···
537
537
538
538
# The rule to compile C files
539
539
540
-
# This rule is similar to GNU make's implicit rule, except that it is more
541
-
# general (it supports both .o and .obj)
540
+
# Cancel GNU Make's implicit C compilation rule
541
+
%.o: %.c
542
542
543
+
# These are still here as they are shared with otherlibs/
543
544
ifeq "$(COMPUTE_DEPS)" "true"
544
545
RUNTIME_HEADERS :=
545
546
REQUIRED_HEADERS :=
···
548
549
$(wildcard $(ROOTDIR)/runtime/caml/*.h)
549
550
REQUIRED_HEADERS := $(RUNTIME_HEADERS) $(wildcard *.h)
550
551
endif
551
-
552
-
%.$(O): %.c $(REQUIRED_HEADERS)
553
-
$(V_CC)$(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(CPPFLAGS) \
554
-
$(OUTPUTOBJ)$@ -c $<
555
552
556
553
$(DEPDIR):
557
554
$(MKDIR) $@
+4
stdlib/Makefile
+4
stdlib/Makefile
···
22
22
23
23
include $(ROOTDIR)/Makefile.common
24
24
25
+
%.$(O): %.c $(REQUIRED_HEADERS)
26
+
$(V_CC)$(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(CPPFLAGS) \
27
+
$(OUTPUTOBJ)$@ -c $<
28
+
25
29
# There are three ways the Standard Library is compiled in bytecode:
26
30
# 1. During coldstart
27
31
# - using ../boot/ocamlc which runs on ../boot/ocamlrun