diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-06-30 01:34:47 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-06-30 01:34:47 +0200 |
| commit | d1fb869e78bdac54c236d7650858ffb5edb8fec2 (patch) | |
| tree | 6ad00281a520e4564beca50eda153e30a61da928 /build | |
| parent | 19e5852ad8dd38480f008e82ae2dbbdd9e0ac11c (diff) | |
| parent | 12885ef48902dcc622eafd771db1f3cc41cbbe6d (diff) | |
| download | php-git-d1fb869e78bdac54c236d7650858ffb5edb8fec2.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
Diffstat (limited to 'build')
| -rw-r--r-- | build/libtool.m4 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/build/libtool.m4 b/build/libtool.m4 index 56658ccbb4..4d948b9078 100644 --- a/build/libtool.m4 +++ b/build/libtool.m4 @@ -1532,10 +1532,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -5843,10 +5839,6 @@ _LT_EOF _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little |