From 446e2dd6743da08ec4136233fdc9179dbbf58fca Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Fri, 14 Apr 2023 02:08:43 -0700 Subject: [PATCH] Don't add `d` files in github actions --- Makefile | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index d2d577460a..2a4e430cdf 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ endif MIN_MACOS_VERSION ?= $(DEFAULT_MIN_MACOS_VERSION) BUN_BASE_VERSION = 0.6 - +WITH_MMD = -MMD AR= BUN_OR_NODE = $(shell which bun 2>/dev/null || which node 2>/dev/null) @@ -117,6 +117,16 @@ ifeq ($(OS_NAME),darwin) CODESIGN_IDENTITY ?= $(shell security find-identity -v -p codesigning | awk '/Apple Development/ { print $$2 }') endif +# if we are CI, set MMD to empty +ifeq ($(GITHUB_ACTION), "true") + WITH_MMD = +endif + +# if we are CI, set MMD to empty +ifeq ($(CI), "true") + WITH_MMD = +endif + # macOS sed is different SED = $(shell which gsed 2>/dev/null || which sed 2>/dev/null) @@ -310,9 +320,16 @@ DEBUG_WEBCRYPTO_OBJ_FILES := $(patsubst $(SRC_DIR)/webcrypto/%.cpp, $(DEBUG_OBJ_ BINDINGS_OBJ := $(OBJ_FILES) $(WEBCORE_OBJ_FILES) $(SQLITE_OBJ_FILES) $(NODE_OS_OBJ_FILES) $(BUILTINS_OBJ_FILES) $(IO_FILES) $(MODULES_OBJ_FILES) $(WEBCRYPTO_OBJ_FILES) DEBUG_BINDINGS_OBJ := $(DEBUG_OBJ_FILES) $(DEBUG_WEBCORE_OBJ_FILES) $(DEBUG_SQLITE_OBJ_FILES) $(DEBUG_NODE_OS_OBJ_FILES) $(DEBUG_BUILTINS_OBJ_FILES) $(DEBUG_IO_FILES) $(DEBUG_MODULES_OBJ_FILES) $(DEBUG_WEBCRYPTO_OBJ_FILES) + +# if we are CI, set MMD to empty +ifneq ($(GITHUB_ACTION), "true") + -include $(BINDINGS_OBJ:.o=.d) -include $(DEBUG_BINDINGS_OBJ:.o=.d) +endif + + ALL_JSC_INCLUDE_DIRS := -I$(WEBKIT_RELEASE_DIR)/WTF/Headers \ -I$(WEBKIT_RELEASE_DIR)/ICU/Headers \ -I$(WEBKIT_RELEASE_DIR)/bmalloc/Headers \ @@ -1453,7 +1470,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) $(UWS_INCLUDE) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1464,7 +1481,7 @@ $(OBJ_DIR)/%.o: src/bun.js/modules/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) $(UWS_INCLUDE) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1475,7 +1492,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/webcore/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1486,7 +1503,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/sqlite/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1497,7 +1514,7 @@ $(OBJ_DIR)/%.o: src/io/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1508,7 +1525,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/node_os/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1519,7 +1536,7 @@ $(OBJ_DIR)/%.o: src/bun.js/builtins/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1531,7 +1548,7 @@ $(OBJ_DIR)/%.o: src/bun.js/bindings/webcrypto/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1545,7 +1562,7 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) $(UWS_INCLUDE) \ $(MACOS_MIN_FLAG) \ $(DEBUG_OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1560,7 +1577,7 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/webcore/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(DEBUG_OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1573,7 +1590,7 @@ $(DEBUG_OBJ_DIR)/%.o: src/io/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(DEBUG_OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1589,7 +1606,7 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/sqlite/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(DEBUG_OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1604,7 +1621,7 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/node_os/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(DEBUG_OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1619,7 +1636,7 @@ $(DEBUG_OBJ_DIR)/%.o: src/bun.js/builtins/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(DEBUG_OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1632,7 +1649,7 @@ $(DEBUG_OBJ_DIR)/%.o: src/bun.js/modules/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(DEBUG_OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -fno-rtti \ -ferror-limit=1000 \ @@ -1646,7 +1663,7 @@ $(DEBUG_OBJ_DIR)/%.o: src/bun.js/bindings/webcrypto/%.cpp $(CXX_WITH_CCACHE) $(CLANG_FLAGS) \ $(MACOS_MIN_FLAG) \ $(DEBUG_OPTIMIZATION_LEVEL) \ - -MMD \ + $(WITH_MMD) \ -fno-exceptions \ -I$(SRC_DIR) \ -fno-rtti \