diff options
| author | Paul Jakma <paul@jakma.org> | 2015-08-20 22:30:17 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-05-26 02:38:35 +0200 |
| commit | 95bb83054bbf6b5f4fcc7e7ce961d63d74212f9f (patch) | |
| tree | d2517bf85a1376d441a63d15a572573721b8615a /configure.ac | |
| parent | pimd: Clean up some more compile warnings (diff) | |
| download | frr-95bb83054bbf6b5f4fcc7e7ce961d63d74212f9f.tar.xz frr-95bb83054bbf6b5f4fcc7e7ce961d63d74212f9f.zip | |
build: Remove the old PIC/PIE patch, let libtool sort it out
* Remove the old change from '08 to add in PIE arguments at automake level.
Versions of libtool since then know how to deal with -fpie and do the right
thing according to whether its building shared or executable objects.
So just pass '-fpie' as CFLAG and let libtool do its thing.
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index f9922f0cf..12d5de869 100755 --- a/configure.ac +++ b/configure.ac @@ -203,7 +203,7 @@ AC_GNU_SOURCE dnl ------- dnl libtool dnl ------- -AC_PROG_LIBTOOL +LT_INIT dnl ---------------------- dnl Packages configuration @@ -1669,29 +1669,6 @@ dnl ---------- CONFDATE=`date '+%Y%m%d'` AC_SUBST(CONFDATE) -dnl Conditionally enable PIE support for GNU toolchains. -AC_ARG_ENABLE(pie, AS_HELP_STRING([--disable-pie], [Do not build tools as a Position Independent Executables])) -if test "$enable_pie" != "no"; then - AC_CACHE_CHECK([whether $CC accepts PIE flags], [ap_cv_cc_pie], [ - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS -fPIE" - LDFLAGS="$LDFLAGS -pie" - AC_LINK_IFELSE([AC_LANG_SOURCE([[static int foo[30000]; int main () { return 0; }]])], - [ap_cv_cc_pie=yes], [ap_cv_cc_pie=no] - ) - CFLAGS=$save_CFLAGS - LDFLAGS=$save_LDFLAGS - ]) - if test "$ap_cv_cc_pie" = "yes"; then - PICFLAGS="-fPIE" - PILDFLAGS="-pie" - fi -fi - -AC_SUBST(PICFLAGS) -AC_SUBST(PILDFLAGS) - dnl ------- dnl DejaGNU dnl ------- |