mirror of https://github.com/rust-lang/rust.git
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.
This commit is contained in:
parent
cb513c7b46
commit
eb5bf151a5
|
@ -266,8 +266,3 @@ ifneq ($(strip $(findstring TAGS.emacs,$(MAKECMDGOALS)) \
|
|||
CFG_INFO := $(info cfg: including ctags rules)
|
||||
include $(CFG_SRC_DIR)mk/ctags.mk
|
||||
endif
|
||||
|
||||
# Find all of the .d files and include them to add information about
|
||||
# header file dependencies.
|
||||
ALL_DEP_FILES := $(ALL_OBJ_FILES:%.o=%.d)
|
||||
-include $(ALL_DEP_FILES)
|
||||
|
|
|
@ -85,10 +85,6 @@ CFG_INFO := $(info cfg: version $(CFG_VERSION))
|
|||
# More configuration
|
||||
######################################################################
|
||||
|
||||
# We track all of the object files we might build so that we can find
|
||||
# and include all of the .d files in one fell swoop.
|
||||
ALL_OBJ_FILES :=
|
||||
|
||||
MKFILE_DEPS := config.stamp $(call rwildcard,$(CFG_SRC_DIR)mk/,*)
|
||||
MKFILES_FOR_TARBALL:=$(MKFILE_DEPS)
|
||||
ifneq ($(NO_MKFILE_DEPS),)
|
||||
|
|
|
@ -90,10 +90,6 @@ ifneq ($(findstring linux,$(CFG_OSTYPE)),)
|
|||
endif
|
||||
endif
|
||||
|
||||
# These flags will cause the compiler to produce a .d file
|
||||
# next to the .o file that lists header deps.
|
||||
CFG_DEPEND_FLAGS = -MMD -MP -MT $(1) -MF $(1:%.o=%.d)
|
||||
|
||||
AR := ar
|
||||
|
||||
define SET_FROM_CFG
|
||||
|
@ -159,7 +155,6 @@ define CFG_MAKE_TOOLCHAIN
|
|||
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
|
||||
$$(CFG_GCCISH_CFLAGS) \
|
||||
$$(CFG_GCCISH_CFLAGS_$(1)) \
|
||||
$$(CFG_DEPEND_FLAGS) \
|
||||
-c -o $$(1) $$(2)
|
||||
CFG_LINK_C_$(1) = $$(CC_$(1)) \
|
||||
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
|
||||
|
@ -171,7 +166,6 @@ define CFG_MAKE_TOOLCHAIN
|
|||
$$(CFG_GCCISH_CXXFLAGS) \
|
||||
$$(CFG_GCCISH_CFLAGS_$(1)) \
|
||||
$$(CFG_GCCISH_CXXFLAGS_$(1)) \
|
||||
$$(CFG_DEPEND_FLAGS) \
|
||||
-c -o $$(1) $$(2)
|
||||
CFG_LINK_CXX_$(1) = $$(CXX_$(1)) \
|
||||
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
|
||||
|
@ -190,7 +184,7 @@ define CFG_MAKE_TOOLCHAIN
|
|||
|
||||
# We're using llvm-mc as our assembler because it supports
|
||||
# .cfi pseudo-ops on mac
|
||||
CFG_ASSEMBLE_$(1)=$$(CPP_$(1)) -E $$(CFG_DEPEND_FLAGS) $$(2) | \
|
||||
CFG_ASSEMBLE_$(1)=$$(CPP_$(1)) -E $$(2) | \
|
||||
$$(LLVM_MC_$$(CFG_BUILD)) \
|
||||
-assemble \
|
||||
-relocation-model=$$(LLVM_MC_RELOCATION_MODEL) \
|
||||
|
@ -202,7 +196,7 @@ define CFG_MAKE_TOOLCHAIN
|
|||
# For the ARM, AARCH64, MIPS and POWER crosses, use the toolchain assembler
|
||||
# FIXME: We should be able to use the LLVM assembler
|
||||
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
|
||||
$$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
|
||||
$$(2) -c -o $$(1)
|
||||
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue