Skip to content

Commit eb5bf15

Browse files
committed
mk: Remove generation of .d files
Looks like cl.exe doesn't support this and we're also barely using them anyway as we have very few header files and C code in general.
1 parent cb513c7 commit eb5bf15

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

Makefile.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,3 @@ ifneq ($(strip $(findstring TAGS.emacs,$(MAKECMDGOALS)) \
266266
CFG_INFO := $(info cfg: including ctags rules)
267267
include $(CFG_SRC_DIR)mk/ctags.mk
268268
endif
269-
270-
# Find all of the .d files and include them to add information about
271-
# header file dependencies.
272-
ALL_DEP_FILES := $(ALL_OBJ_FILES:%.o=%.d)
273-
-include $(ALL_DEP_FILES)

mk/main.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ CFG_INFO := $(info cfg: version $(CFG_VERSION))
8585
# More configuration
8686
######################################################################
8787

88-
# We track all of the object files we might build so that we can find
89-
# and include all of the .d files in one fell swoop.
90-
ALL_OBJ_FILES :=
91-
9288
MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*)
9389
MKFILES_FOR_TARBALL:=$(MKFILE_DEPS)
9490
ifneq ($(NO_MKFILE_DEPS),)

mk/platform.mk

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ ifneq ($(findstring linux,$(CFG_OSTYPE)),)
9090
endif
9191
endif
9292

93-
# These flags will cause the compiler to produce a .d file
94-
# next to the .o file that lists header deps.
95-
CFG_DEPEND_FLAGS = -MMD -MP -MT $(1) -MF $(1:%.o=%.d)
96-
9793
AR := ar
9894

9995
define SET_FROM_CFG
@@ -159,7 +155,6 @@ define CFG_MAKE_TOOLCHAIN
159155
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
160156
$$(CFG_GCCISH_CFLAGS) \
161157
$$(CFG_GCCISH_CFLAGS_$(1)) \
162-
$$(CFG_DEPEND_FLAGS) \
163158
-c -o $$(1) $$(2)
164159
CFG_LINK_C_$(1) = $$(CC_$(1)) \
165160
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
@@ -171,7 +166,6 @@ define CFG_MAKE_TOOLCHAIN
171166
$$(CFG_GCCISH_CXXFLAGS) \
172167
$$(CFG_GCCISH_CFLAGS_$(1)) \
173168
$$(CFG_GCCISH_CXXFLAGS_$(1)) \
174-
$$(CFG_DEPEND_FLAGS) \
175169
-c -o $$(1) $$(2)
176170
CFG_LINK_CXX_$(1) = $$(CXX_$(1)) \
177171
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
@@ -190,7 +184,7 @@ define CFG_MAKE_TOOLCHAIN
190184

191185
# We're using llvm-mc as our assembler because it supports
192186
# .cfi pseudo-ops on mac
193-
CFG_ASSEMBLE_$(1)=$$(CPP_$(1)) -E $$(CFG_DEPEND_FLAGS) $$(2) | \
187+
CFG_ASSEMBLE_$(1)=$$(CPP_$(1)) -E $$(2) | \
194188
$$(LLVM_MC_$$(CFG_BUILD)) \
195189
-assemble \
196190
-relocation-model=$$(LLVM_MC_RELOCATION_MODEL) \
@@ -202,7 +196,7 @@ define CFG_MAKE_TOOLCHAIN
202196
# For the ARM, AARCH64, MIPS and POWER crosses, use the toolchain assembler
203197
# FIXME: We should be able to use the LLVM assembler
204198
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
205-
$$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
199+
$$(2) -c -o $$(1)
206200

207201
endif
208202

0 commit comments

Comments
 (0)