Use CFLAGS when linking so mixed sparc builds can supply -m64

diff --git a/WHATS_NEW b/WHATS_NEW
index 3593f32e50c9b91cf01e965fe0b0b15ea00029e8..74a2946db2f4bec1480c06d3048070b6d4008b19 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.18 -
 ====================================
+  Use CFLAGS when linking so mixed sparc builds can supply -m64.
   Prevent permission changes on active mirrors.
   Print warning instead of error message if lvconvert cannot zero volume.
   Add snapshot options to lvconvert man page.

diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in
index c96a5cd8ce67dfa0ff6e82029ca2983929b245df..52d5ce511c8f25dd64d58be0ce26a8577e203092 100644 (file)
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
@@ -71,7 +71,8 @@ INSTALL_TARGETS = \
        install_clvmd
 
 clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
-       $(CC) -o clvmd $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LMLIBS) $(LIBS)
+       $(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \
+               $(LVMLIBS) $(LMLIBS) $(LIBS)
 
 .PHONY: install_clvmd
 

diff --git a/make.tmpl.in b/make.tmpl.in
index 1ffa8ec44679012794d0a08f6a192f338067b1a5..e1907e546d95eb640635318687788adf002370fb 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -75,6 +75,9 @@ endif
 
 ifneq ("@DMDIR@", "")
   LDFLAGS += -L@DMDIR@/lib/ioctl
+  ifeq ("@DMEVENTD@", "yes")
+    LDFLAGS += -L@DMDIR@/dmeventd
+  endif
 endif
 
 LDFLAGS += -L$(top_srcdir)/lib -L$(libdir)
@@ -170,18 +173,19 @@ $(TARGETS): $(OBJECTS)
 ifeq ("@LIB_SUFFIX@","so")
 $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
        $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-       $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+       $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 
 ifeq ("@LIB_SUFFIX@","dylib")
 $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
        $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
-       $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
+       $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
 endif
 
 %.so: %.a
        $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
-       $(CLDFLAGS) $(LIBS) -o $@ @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
+       $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
+       @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
 
 $(LIB_STATIC): $(OBJECTS)
        $(RM) $@

diff --git a/tools/Makefile.in b/tools/Makefile.in
index a5696853ede1b6dc605b304fffc45229df4bd5c3..a1726749fdef35dc5ebafc8aaad4511c03969c3e 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -101,11 +101,12 @@ DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
 include $(top_srcdir)/make.tmpl
 
 lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
-       $(CC) -o $@ $(OBJECTS) lvm.o $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
+       $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
+               $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
 
 lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
-       $(CC) -o $@ $(OBJECTS) lvm-static.o -static $(LDFLAGS) $(LVMLIBS) \
-               $(LIBS) -rdynamic
+       $(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
+               $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
 
 liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
        cat $(top_srcdir)/lib/liblvm.a > $@

diff --git a/tools/fsadm/Makefile.in b/tools/fsadm/Makefile.in
index e84a0149963d8eca4b5b4e2f6c501d9f05dff19c..7a4bc3cd46428a57c64d306cd46d9d6bbc37cf45 100644 (file)
--- a/tools/fsadm/Makefile.in
+++ b/tools/fsadm/Makefile.in
@@ -23,7 +23,7 @@ TARGETS = fsadm
 include $(top_srcdir)/make.tmpl
 
 fsadm: $(OBJECTS)
-       $(CC) -o $@ $(OBJECTS) -rdynamic
+       $(CC) -o $@ $(CFLAGS) $(OBJECTS) -rdynamic
 
 install: fsadm
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm \