| From 5c84b039e97abd88f6a18da0e6d27383c00fea92 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Wed, 26 Jul 2017 23:06:56 -0700 |
| Subject: [PATCH] Specify --tag with libtool |
| |
| This helps in compiling with external toolchains |
| with -fPIE appended to CC e.g. via hardening flags |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| acinclude.m4 | 8 ++++---- |
| configure.in | 4 ++-- |
| 2 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/acinclude.m4 b/acinclude.m4 |
| index a114a98..1cc7a26 100644 |
| --- a/acinclude.m4 |
| +++ b/acinclude.m4 |
| @@ -806,10 +806,10 @@ dnl |
| dnl PHP_BUILD_PROGRAM |
| dnl |
| AC_DEFUN([PHP_BUILD_PROGRAM],[ |
| - php_c_pre='$(LIBTOOL) --mode=compile $(CC)' |
| + php_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)' |
| php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' |
| php_c_post= |
| - php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' |
| + php_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)' |
| php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' |
| php_cxx_post= |
| php_lo=lo |
| @@ -819,10 +819,10 @@ AC_DEFUN([PHP_BUILD_PROGRAM],[ |
| no) pic_setting='-prefer-non-pic';; |
| esac |
| |
| - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' |
| + shared_c_pre='$(LIBTOOL) --tag=CC --mode=compile $(CC)' |
| shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting |
| shared_c_post= |
| - shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' |
| + shared_cxx_pre='$(LIBTOOL) --tag=CXX --mode=compile $(CXX)' |
| shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting |
| shared_cxx_post= |
| shared_lo=lo |
| diff --git a/configure.in b/configure.in |
| index 7d65b63..7221af9 100644 |
| --- a/configure.in |
| +++ b/configure.in |
| @@ -1431,8 +1431,8 @@ PHP_SET_LIBTOOL_VARIABLE([--silent]) |
| dnl libtool 1.4.3 needs this. |
| PHP_SET_LIBTOOL_VARIABLE([--preserve-dup-deps]) |
| |
| -test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' |
| -test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' |
| +test -z "$PHP_COMPILE" && PHP_COMPILE='$(LIBTOOL) --tag=CC --mode=compile $(COMPILE) -c $<' |
| +test -z "$CXX_PHP_COMPILE" && CXX_PHP_COMPILE='$(LIBTOOL) --tag=CXX --mode=compile $(CXX_COMPILE) -c $<' |
| SHARED_LIBTOOL='$(LIBTOOL)' |
| |
| CC=$old_CC |
| -- |
| 2.13.3 |
| |