1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
Author: Francois Mazen <francois@mzf.fr>
Description: Add LDFLAGS and CXXFLAGS at several places to enable hardening flags.
Forwarded: not-needed
--- a/plugin/seq/load.link.in
+++ b/plugin/seq/load.link.in
@@ -273,9 +273,9 @@
exit 1;
fi
if [ "$files" ] ;then
- echo $CXX -c $FLAGS $CXXFLAGS $INC $PIC $FFCXXFLAGS $files
+ echo $CXX -c $FLAGS $CXXFLAGS $INC $PIC $FFCXXFLAGS $files $LDFLAGS
if [ $do = yes ] ; then
- eval $CXX -c $INC $FLAGS $CXXFLAGS $PIC $FFCXXFLAGS $files
+ eval $CXX -c $INC $FLAGS $CXXFLAGS $PIC $FFCXXFLAGS $files $LDFLAGS
ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
fi
echo
@@ -290,9 +290,9 @@
echo
fi
if [ "$CONLY" != yes ]; then
- echo $CXX $FFLDFLAGS $SHARED $FLAGS $CXXFLAGS $FFCXXFLAGS $fileso -o $out.$SUF $LIBS $DLL $OTHER $WMPI_LIB
+ echo $CXX $FFLDFLAGS $SHARED $FLAGS $CXXFLAGS $FFCXXFLAGS $fileso -o $out.$SUF $LIBS $DLL $OTHER $WMPI_LIB $LDFLAGS
if [ $do = yes ] ; then
- eval $CXX $FFLDFLAGS $SHARED $FLAGS $CXXFLAGS $FFCXXFLAGS $fileso -o $out.$SUF $LIBS $DLL $OTHER $WMPI_LIB
+ eval $CXX $FFLDFLAGS $SHARED $FLAGS $CXXFLAGS $FFCXXFLAGS $fileso -o $out.$SUF $LIBS $DLL $OTHER $WMPI_LIB $LDFLAGS
ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
fi
echo
@@ -305,9 +305,9 @@
test $do = yes && cp $DLL "$bin"
fi
if [ -n "$OWMPI" ] ; then
- echo $CXX $FFLDFLAGS $SHARED $FLAGS $CXXFLAGS $FFCXXFLAGS $fileso -o $OWMPI $LIBS $DLL $OTHER $MPI_LIB
+ echo $CXX $FFLDFLAGS $SHARED $FLAGS $CXXFLAGS $FFCXXFLAGS $fileso -o $OWMPI $LIBS $DLL $OTHER $MPI_LIB $LDFLAGS
if [ $do = yes ] ; then
- eval $CXX $FFLDFLAGS $SHARED $FLAGS $CXXFLAGS $FFCXXFLAGS $fileso -o $OWMPI $LIBS $DLL $OTHER $MPI_LIB
+ eval $CXX $FFLDFLAGS $SHARED $FLAGS $CXXFLAGS $FFCXXFLAGS $fileso -o $OWMPI $LIBS $DLL $OTHER $MPI_LIB $LDFLAGS
ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
fi
echo
--- a/plugin/seq/Makefile.am
+++ b/plugin/seq/Makefile.am
@@ -204,7 +204,7 @@
fi
ffmaster$(EXEEXT): libff-mmap-semaphore.o ffmaster.c libff-mmap-semaphore.h WHERE_LIBRARY-download
- $(CC) $(CFLAGS) ffmaster.c libff-mmap-semaphore.o -o ffmaster \
+ $(CC) $(CFLAGS) $(CPPFLAGS) ffmaster.c libff-mmap-semaphore.o -o ffmaster $(LDFLAGS) \
`awk -f ff-get-dep.awk -v libs="[pthread-google|pthread]" WHERE_LIBRARY-download WHERE_LIBRARY-config`
clean-local::
--- a/3rdparty/tetgen/Makefile
+++ b/3rdparty/tetgen/Makefile
@@ -30,8 +30,8 @@
# FFCS - 30/11/10 - need ranlib on Win64. The PATH is setup so that mingw/ranlib is called
fait-tags.done:tar-tags.done cxxflags
- cd $(SRCDIR);$(CXX) $(CXXFLAGS) -O3 -fPIC -DSELF_CHECK -DNDEBUG -DTETLIBRARY -c tetgen.cxx
- cd $(SRCDIR);$(CXX) $(CXXFLAGS) -O0 -fPIC -DSELF_CHECK -DNDEBUG -DTETLIBRARY -c predicates.cxx
+ cd $(SRCDIR);$(CXX) $(CXXFLAGS) -O3 -fPIC -DSELF_CHECK -DNDEBUG -DTETLIBRARY -c tetgen.cxx $(LDFLAGS)
+ cd $(SRCDIR);$(CXX) $(CXXFLAGS) -O0 -fPIC -DSELF_CHECK -DNDEBUG -DTETLIBRARY -c predicates.cxx $(LDFLAGS)
touch fait-tags.done
WHERE:WHERE.done
WHERE.done: fait-tags.done
@@ -80,4 +80,4 @@
../../bin/ff-md5 $(PACKAGE) >> cxxflags
if diff -q cxxflags cxxflags.old ; then echo No Modif skip compile of tetgen ; mv -f cxxflags.old cxxflags; else touch -c tar-tags.done; fi
-.PHONY:$(SRCDIR)/$(INSTALL)
\ No newline at end of file
+.PHONY:$(SRCDIR)/$(INSTALL)
--- a/src/medit/Makefile.am
+++ b/src/medit/Makefile.am
@@ -25,7 +25,7 @@
ffmedit_DEPENDENCIES=picking.$(OBJEXT)
picking.$(OBJEXT):picking.c
- ${CC} -c $< $(CNOFLAGS) -o $@
+ ${CC} -c $< $(CFLAGS) $(CPPFLAGS) -o $@ $(LDFLAGS)
#pinking.no-optffmedit$(EXEEXT):picking.c
# rm picking.$(OBJEXT)
--- a/Makefile.am
+++ b/Makefile.am
@@ -204,7 +204,7 @@
cd src/ide && $(MAKE) $(AM_MAKEFLAGS) FreeFem++-cs$(EXEEXT)
bin/md2edp$(EXEEXT):etc/tools/md2edp.cpp
- $(CXX) $(CXXFLAGS) etc/tools/md2edp.cpp -o bin/md2edp$(EXEEXT)
+ $(CXX) $(CXXFLAGS) etc/tools/md2edp.cpp -o bin/md2edp$(EXEEXT) $(CPPFLAGS) $(LDFLAGS)
# Cleaning generated files which are stored in the CVS repository, to
# avoid technical CVS conflicts.
|
