shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

makefiles: comman escape needs this trick

Browse Source
This commit is contained in:
Zdenek Kabelac 2024-04-24 13:42:05 +02:00
parent a8009f72bf
commit b14f29ab5b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libdm/make.tmpl.in
View File

@ -233,19 +233,20 @@ endif
endif endif
ifeq ("@HAVE_FULL_RELRO@", "yes") ifeq ("@HAVE_FULL_RELRO@", "yes")
comma := ,
ifneq ("@STATIC_LINK@", "yes") ifneq ("@STATIC_LINK@", "yes")
ifeq (,$(findstring -z\,relro,$(LDFLAGS))) ifeq (,$(findstring -z$(comma)relro,$(LDFLAGS)))
LDFLAGS += -Wl,-z,relro LDFLAGS += -Wl,-z,relro
endif endif
ifeq (,$(findstring -z\,now,$(LDFLAGS))) ifeq (,$(findstring -z$(comma)now,$(LDFLAGS)))
LDFLAGS += -Wl,-z,now LDFLAGS += -Wl,-z,now
endif endif
ifeq (,$(findstring -z\,pack-relative-relocs,$(LDFLAGS))) ifeq (,$(findstring -z$(comma)pack-relative-relocs,$(LDFLAGS)))
LDFLAGS += -Wl,-z,pack-relative-relocs LDFLAGS += -Wl,-z,pack-relative-relocs
endif endif
# For systems with old readline library that requires extra libs to link with # For systems with old readline library that requires extra libs to link with
# we stick to default --no-as-needed and we avoid adding --as-needed flag # we stick to default --no-as-needed and we avoid adding --as-needed flag
ifneq (2,$(words $(findstring -l,$(READLINE_LIBS)))) ifneq (2,$(words $(findstring -l%,$(READLINE_LIBS))))
ifeq (,$(findstring --as-needed,$(LDFLAGS))) ifeq (,$(findstring --as-needed,$(LDFLAGS)))
LDFLAGS += -Wl,--as-needed LDFLAGS += -Wl,--as-needed
endif endif

9
make.tmpl.in
View File

@ -270,19 +270,20 @@ endif
endif endif
ifeq ("@HAVE_FULL_RELRO@", "yes") ifeq ("@HAVE_FULL_RELRO@", "yes")
comma := ,
ifneq ("@STATIC_LINK@", "yes") ifneq ("@STATIC_LINK@", "yes")
ifeq (,$(findstring -z\,relro,$(LDFLAGS))) ifeq (,$(findstring -z$(comma)relro,$(LDFLAGS)))
LDFLAGS += -Wl,-z,relro LDFLAGS += -Wl,-z,relro
endif endif
ifeq (,$(findstring -z\,now,$(LDFLAGS))) ifeq (,$(findstring -z$(comma)now,$(LDFLAGS)))
LDFLAGS += -Wl,-z,now LDFLAGS += -Wl,-z,now
endif endif
ifeq (,$(findstring -z\,pack-relative-relocs,$(LDFLAGS))) ifeq (,$(findstring -z$(comma)pack-relative-relocs,$(LDFLAGS)))
LDFLAGS += -Wl,-z,pack-relative-relocs LDFLAGS += -Wl,-z,pack-relative-relocs
endif endif
# For systems with old readline library that requires extra libs to link with # For systems with old readline library that requires extra libs to link with
# we stick to default --no-as-needed and we avoid adding --as-needed flag # we stick to default --no-as-needed and we avoid adding --as-needed flag
ifneq (2,$(words $(findstring -l,$(READLINE_LIBS)))) ifneq (2,$(words $(findstring -l%,$(READLINE_LIBS))))
ifeq (,$(findstring --as-needed,$(LDFLAGS))) ifeq (,$(findstring --as-needed,$(LDFLAGS)))
LDFLAGS += -Wl,--as-needed LDFLAGS += -Wl,--as-needed
endif endif