diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:09 -0700 |
| commit | f4788a577b4b3e3f070154a926d6067cfdbaf75e (patch) | |
| tree | 923d8ee8748c164bee87ff5dffed2f7b577cc395 | |
| parent | Merge branch 'rs/diff-exit-code-with-external-diff' (diff) | |
| parent | Makefile: add ability to append to CFLAGS and LDFLAGS (diff) | |
| download | git-f4788a577b4b3e3f070154a926d6067cfdbaf75e.tar.gz git-f4788a577b4b3e3f070154a926d6067cfdbaf75e.zip | |
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
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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)) |