summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2014-03-26 22:27:55 +0100
committerMichael Brown2014-03-26 22:28:27 +0100
commit8540300951b967cf8dad1e8a4106b716ba7e848f (patch)
tree8949f77d002ee2f8b39dd3a4d72f486bff2b9d39
parent[build] Remove long-obsolete mechanism for wrapping embedded images (diff)
downloadipxe-8540300951b967cf8dad1e8a4106b716ba7e848f.tar.gz
ipxe-8540300951b967cf8dad1e8a4106b716ba7e848f.tar.xz
ipxe-8540300951b967cf8dad1e8a4106b716ba7e848f.zip
[build] Disable ccache for all relevant build targets
The build process currently attempts to disable ccache for files using the .incbin directive, but the rule fails to apply to anything beyond the simple object target. Fix by applying to all relevant build targets (including debug objects, assembly listings, and so on). Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/Makefile.housekeeping7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 939d5bcc..d1dac6f7 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -674,9 +674,8 @@ CFLAGS_clientcert += $(if $(PRIVKEY),-DPRIVATE_KEY="\"$(PRIVKEY_INC)\"")
# Unfortunately ccache does not detect this dependency and caches
# builds even when the binary file has changed.
#
-$(BIN)/embedded.o : override CC := env CCACHE_DISABLE=1 $(CC)
-
-$(BIN)/clientcert.o : override CC := env CCACHE_DISABLE=1 $(CC)
+$(BIN)/embedded.% : override CC := env CCACHE_DISABLE=1 $(CC)
+$(BIN)/clientcert.% : override CC := env CCACHE_DISABLE=1 $(CC)
# Version number
#
@@ -686,7 +685,7 @@ CFLAGS_version += -DVERSION_MAJOR=$(VERSION_MAJOR) \
-DVERSION="\"$(VERSION)\""
# Make sure the version number gets updated on every git checkout
ifneq ($(GITVERSION),)
-$(BIN)/version.o : ../.git/index
+$(BIN)/version.% : ../.git/index
endif
# We automatically generate rules for any file mentioned in AUTO_SRCS