diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2023-02-12 13:12:23 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2023-02-13 13:41:59 +0100 |
| commit | 4791a4fc68c681a45bcdc5660c6e96af607fab27 (patch) | |
| tree | bd500679dc12c0dbe2e1e2230fee561141778df2 | |
| parent | 50f73de4b27c11c810c8f7aea3e36a5c947408af (diff) | |
| download | lvm2-4791a4fc68c681a45bcdc5660c6e96af607fab27.tar.gz | |
makefiles: allow using configure cppflags
Configure defines 'CPPFLAGS' and we should use defined value
for compilation.
Reported-by: debian
| -rw-r--r-- | libdm/make.tmpl.in | 5 | ||||
| -rw-r--r-- | make.tmpl.in | 5 | ||||
| -rw-r--r-- | tools/Makefile.in | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index 92dc715d2..fb8973b6b 100644 --- a/libdm/make.tmpl.in +++ b/libdm/make.tmpl.in @@ -59,6 +59,7 @@ DEFS += @DEFS@ # FIXME set this only where it's needed, not globally? CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ LDFLAGS ?= @LDFLAGS@ +CPPFLAGS ?= @CPPFLAGS@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ LDDEPS += @LDDEPS@ @@ -412,7 +413,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64 %.o: %.c $(DEPS) @echo " [CC] $(<F)" @mkdir -p $(@D) - $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ + $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@ %.o: %.cpp $(DEPS) @echo " [CXX] $(<F)" @@ -422,7 +423,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64 %.pot: %.c $(DEPS) @echo " [CC] $@" @mkdir -p $(@D) - $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@ + $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS) $< >$@ %.so: %.o @echo " [CC] $(<F)" diff --git a/make.tmpl.in b/make.tmpl.in index 222ed671a..9f4ecc33f 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -63,6 +63,7 @@ STATIC_LIBS = $(PTHREAD_LIBS) DEFS += @DEFS@ # FIXME set this only where it's needed, not globally? CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ +CPPFLAGS ?= @CPPFLAGS@ LDFLAGS ?= @LDFLAGS@ CLDFLAGS += @CLDFLAGS@ ELDFLAGS += @ELDFLAGS@ @@ -477,7 +478,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64 %.o: %.c $(DEPS) @echo " [CC] $(<F)" @mkdir -p $(@D) - $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ + $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@ %.o: %.cpp $(DEPS) @echo " [CXX] $(<F)" @@ -487,7 +488,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64 %.pot: %.c $(DEPS) @echo " [CC] $(<F)" @mkdir -p $(@D) - $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@ + $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS) $< >$@ %.so: %.o @echo " [CC] $(<F)" diff --git a/tools/Makefile.in b/tools/Makefile.in index 2a663a5b6..545b94f23 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -133,7 +133,7 @@ man-generator.c: $(srcdir)/command.c man-generator: man-generator.o @echo " [CC] $@" - $(Q) $(CC) $(CFLAGS) -o $@ $(<F) + $(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(<F) lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) @echo " [CC] $@" |