aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-06-20 15:45:09 -0700
committerJunio C Hamano <gitster@pobox.com>2024-06-20 15:45:09 -0700
commitf4788a577b4b3e3f070154a926d6067cfdbaf75e (patch)
tree923d8ee8748c164bee87ff5dffed2f7b577cc395 /Makefile
parent8ba7dbdefbc274628b6bdc0a4cb573c2fa08b2cf (diff)
parent1d969afb785a86ad9851c6e1c3253cc11f8507dd (diff)
downloadgit-f4788a577b4b3e3f070154a926d6067cfdbaf75e.tar.xz
Merge branch 'ps/make-append-to-cflags'
To help developers, the build procedure now allows builders to use CFLAGS_APPEND to specify additional CFLAGS. * ps/make-append-to-cflags: Makefile: add ability to append to CFLAGS and LDFLAGS
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 990aa3ca30..9985b7b682 100644
--- a/Makefile
+++ b/Makefile
@@ -1449,8 +1449,8 @@ ALL_COMMANDS_TO_INSTALL += git-upload-archive$(X)
ALL_COMMANDS_TO_INSTALL += git-upload-pack$(X)
endif
-ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
-ALL_LDFLAGS = $(LDFLAGS)
+ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_APPEND)
+ALL_LDFLAGS = $(LDFLAGS) $(LDFLAGS_APPEND)
ifdef SANITIZE
SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag))