diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-10-10 16:24:12 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-10-10 16:28:59 +0300 |
| commit | 1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325 (patch) | |
| tree | 3ce8591cd8e8340cc5f566d827b0ff9c091713b5 /build | |
| parent | b64a182233344030dee3fb269c1d60cf1a23b106 (diff) | |
| download | php-git-1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.tar.gz | |
Revert "Don't buid static libaraies when only DSO required"
This reverts commit f633c347574c0d814050b4bf2493e0cac6a5988c.
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.global | 2 | ||||
| -rw-r--r-- | build/php.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/Makefile.global b/build/Makefile.global index 3aec9fc9d5..82e0d69f35 100644 --- a/build/Makefile.global +++ b/build/Makefile.global @@ -16,7 +16,7 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) build-binaries: $(PHP_BINARIES) libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link --tag=disable-static $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) diff --git a/build/php.m4 b/build/php.m4 index 57016ad766..2105e70324 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -849,7 +849,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[ \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir) $3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES) - \$(LIBTOOL) --mode=link --tag=disable-static ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) + \$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) EOF ]) |