| Message ID | patch-v3-6.9-1b6ecb27f02-20220225T090127Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Makefile: optimize noop runs, add shared.mak | expand |
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes: > Move these variables over to the shared.max, we'll make use of them in max? > a subsequent commit. There was no reason for these to be "simply > expanded variables", so let's use the normal lazy "=" assignment here. Seems to do unrelated things "while at it" which is a common pattern that slows the reviews down. > diff --git a/shared.mak b/shared.mak > index 1dda948df09..f6b589ffd8f 100644 > --- a/shared.mak > +++ b/shared.mak > @@ -23,3 +23,11 @@ > # > # info make --index-search=.DELETE_ON_ERROR > .DELETE_ON_ERROR: > + > +### Global variables > + > +## comma, empty, space: handy variables as these tokens are either > +## special or can be hard to spot among other Makefile syntax. > +comma = , > +empty = > +space = $(empty) $(empty) In any case, wanting to have a $(space) is not specific to the top-level Makefile, and it is a good idea to move them to the shared file.
diff --git a/Makefile b/Makefile index 1462016a3f4..81b2eaa0355 100644 --- a/Makefile +++ b/Makefile @@ -1289,10 +1289,6 @@ endif ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) ALL_LDFLAGS = $(LDFLAGS) -comma := , -empty := -space := $(empty) $(empty) - ifdef SANITIZE SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag)) BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE) diff --git a/shared.mak b/shared.mak index 1dda948df09..f6b589ffd8f 100644 --- a/shared.mak +++ b/shared.mak @@ -23,3 +23,11 @@ # # info make --index-search=.DELETE_ON_ERROR .DELETE_ON_ERROR: + +### Global variables + +## comma, empty, space: handy variables as these tokens are either +## special or can be hard to spot among other Makefile syntax. +comma = , +empty = +space = $(empty) $(empty)
Move these variables over to the shared.max, we'll make use of them in a subsequent commit. There was no reason for these to be "simply expanded variables", so let's use the normal lazy "=" assignment here. See 425ca6710b2 (Makefile: allow combining UBSan with other sanitizers, 2017-07-15) for the commit that introduced these. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- Makefile | 4 ---- shared.mak | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-)