diff options
| author | Alasdair Kergon <agk@redhat.com> | 2007-01-11 17:12:27 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2007-01-11 17:12:27 +0000 |
| commit | 3b007b270d624845ad83597bcf78a67c8cae9cc9 (patch) | |
| tree | e63a2cdb78a0119227bd4a37abcf1b02c387f0b0 /make.tmpl.in | |
| parent | 4594807a249292a9f32dacd2102bbc1b4c8324d1 (diff) | |
| download | lvm2-3b007b270d624845ad83597bcf78a67c8cae9cc9.tar.gz lvm2-3b007b270d624845ad83597bcf78a67c8cae9cc9.tar.xz lvm2-3b007b270d624845ad83597bcf78a67c8cae9cc9.zip | |
Use CFLAGS when linking so mixed sparc builds can supply -m64
Diffstat (limited to 'make.tmpl.in')
| -rw-r--r-- | make.tmpl.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index 1ffa8ec4..e1907e54 100644 --- 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) $@ |