|
 |
d5c755 |
diff -ur a/client/Makefile.in b/client/Makefile.in
|
|
|
d5c755 |
--- a/client/Makefile.in 2014-06-23 15:56:09.000000000 -0400
|
|
|
d5c755 |
+++ b/client/Makefile.in 2017-05-22 12:33:13.587241001 -0400
|
|
|
d5c755 |
@@ -40,10 +40,10 @@
|
|
|
d5c755 |
ln -snf $^ $@
|
|
|
d5c755 |
|
|
|
d5c755 |
fence_virt: ${fence_virt_SOURCES:.c=.o}
|
|
|
d5c755 |
- $(CC) -o $@ $^ $(LIBS) -L../common -lfence_virt
|
|
|
d5c755 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -L../common -lfence_virt
|
|
|
d5c755 |
|
|
|
d5c755 |
%.o: %.c
|
|
|
d5c755 |
- $(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
|
|
|
d5c755 |
+ $(CC) -c -o $@ $^ $(INCLUDES) $(CFLAGS)
|
|
|
d5c755 |
|
|
|
d5c755 |
install: all
|
|
|
d5c755 |
if [ ! -d ${DESTDIR}/${sbindir} ]; then \
|
|
|
d5c755 |
diff -ur a/Makefile.top.in b/Makefile.top.in
|
|
|
d5c755 |
--- a/Makefile.top.in 2014-06-23 15:56:09.000000000 -0400
|
|
|
d5c755 |
+++ b/Makefile.top.in 2017-05-22 12:24:26.973934895 -0400
|
|
|
d5c755 |
@@ -1,8 +1,9 @@
|
|
|
d5c755 |
CC=@CC@
|
|
|
d5c755 |
CXX=@CXX@
|
|
|
d5c755 |
|
|
|
d5c755 |
-CFLAGS=@CFLAGS@
|
|
|
d5c755 |
-CFLAGS+=-fPIC -Wall -Wstrict-prototypes -Wshadow -D_GNU_SOURCE
|
|
|
d5c755 |
+CFLAGS=-fPIC -Wall -Wstrict-prototypes -Wshadow -D_GNU_SOURCE -Wl,-z,relro,-z,now
|
|
|
d5c755 |
+CFLAGS_BIN=@CFLAGS@
|
|
|
d5c755 |
+LDFLAGS=@LDFLAGS@
|
|
|
d5c755 |
|
|
|
d5c755 |
LEX=@LEX@
|
|
|
d5c755 |
YACC=@YACC@
|
|
|
d5c755 |
diff -ur a/server/Makefile.in b/server/Makefile.in
|
|
|
d5c755 |
--- a/server/Makefile.in 2014-06-23 15:56:09.000000000 -0400
|
|
|
d5c755 |
+++ b/server/Makefile.in 2017-05-22 13:03:14.183158260 -0400
|
|
|
d5c755 |
@@ -152,38 +152,38 @@
|
|
|
d5c755 |
all: ${TARGETS} ${MODULES}
|
|
|
d5c755 |
|
|
|
d5c755 |
fence_virtd: ${fence_virtd_SOURCES:.c=.o} ${fence_virtd_cxx_SOURCES:.cpp=.opp}
|
|
|
d5c755 |
- $(CXX) -o $@ $^ $(MAIN_LIBS) $(LIBS)
|
|
|
d5c755 |
+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(MAIN_LIBS) $(LIBS)
|
|
|
d5c755 |
|
|
|
d5c755 |
multicast.so: ${multicast_so_SOURCES:.c=.o}
|
|
|
d5c755 |
- $(CC) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
|
|
|
d5c755 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
|
|
|
d5c755 |
|
|
|
d5c755 |
libvirt.so: ${libvirt_so_SOURCES:.c=.o}
|
|
|
d5c755 |
- $(CC) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS)
|
|
|
d5c755 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS)
|
|
|
d5c755 |
|
|
|
d5c755 |
libvirt-qmf.so: ${libvirt_qmf_so_SOURCES:.c=.o} ${libvirt_qmf_cxx_so_SOURCES:.cpp=.opp}
|
|
|
d5c755 |
- $(CXX) -o $@ $^ $(LIBS) -shared $(VIRT_QPID)
|
|
|
d5c755 |
+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_QPID)
|
|
|
d5c755 |
|
|
|
d5c755 |
pm-fence.so: ${pm_fence_so_SOURCES:.c=.o}
|
|
|
d5c755 |
- $(CC) -o $@ $^ $(LIBS) -shared $(PACEMAKER_LIBS)
|
|
|
d5c755 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(PACEMAKER_LIBS)
|
|
|
d5c755 |
|
|
|
d5c755 |
null.so: ${null_so_SOURCES:.c=.o}
|
|
|
d5c755 |
- $(CC) -o $@ $^ $(LIBS) -shared
|
|
|
d5c755 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared
|
|
|
d5c755 |
|
|
|
d5c755 |
checkpoint.so: ${checkpoint_so_SOURCES:.c=.o}
|
|
|
d5c755 |
- $(CC) -o $@ $^ $(LIBS) -shared $(AIS_LIBS) $(VIRT_LIBS) \
|
|
|
d5c755 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(AIS_LIBS) $(VIRT_LIBS) \
|
|
|
d5c755 |
$(COROSYNC_LIBS) $(CMAN_LIBS)
|
|
|
d5c755 |
|
|
|
d5c755 |
serial.so: ${serial_so_SOURCES:.c=.o}
|
|
|
d5c755 |
- $(CC) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS)
|
|
|
d5c755 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(VIRT_LIBS) $(UUID_LIBS) $(XML_LIBS)
|
|
|
d5c755 |
|
|
|
d5c755 |
tcp.so: ${tcp_so_SOURCES:.c=.o}
|
|
|
d5c755 |
- $(CC) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
|
|
|
d5c755 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -shared $(NSS_LIBS)
|
|
|
d5c755 |
|
|
|
d5c755 |
%.o: %.c
|
|
|
d5c755 |
- $(CC) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
|
|
|
d5c755 |
+ $(CC) -c -o $@ $^ $(INCLUDES) $(CFLAGS)
|
|
|
d5c755 |
|
|
|
d5c755 |
%.opp: %.cpp
|
|
|
d5c755 |
- $(CXX) $(CFLAGS) -c -o $@ $^ $(INCLUDES)
|
|
|
d5c755 |
+ $(CXX) -c -o $@ $^ $(INCLUDES) $(CFLAGS)
|
|
|
d5c755 |
|
|
|
d5c755 |
install: all
|
|
|
d5c755 |
if [ ! -d ${DESTDIR}/${sbindir} ]; then \
|