diff options
| author | Marko Karppinen <markonen@php.net> | 2002-07-04 08:39:11 +0000 |
|---|---|---|
| committer | Marko Karppinen <markonen@php.net> | 2002-07-04 08:39:11 +0000 |
| commit | a6eeec28b63b6661f5b25810f17d7f665daefc22 (patch) | |
| tree | 0e03ad76579855cb9d195e1d0ad86db5a9207624 | |
| parent | 8548b6390f3304dea1524474906d0f5226fe7ab3 (diff) | |
| download | php-git-a6eeec28b63b6661f5b25810f17d7f665daefc22.tar.gz | |
Moved the cgi link line to sapi/cgi/config.m4 and stopped
using libtool on Darwin on it
| -rw-r--r-- | Makefile.global | 4 | ||||
| -rw-r--r-- | sapi/cgi/config.m4 | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index 2755e136dd..ea8c9d262c 100644 --- a/Makefile.global +++ b/Makefile.global @@ -17,8 +17,8 @@ libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so php: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link $(CC) -export-dynamic $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ - + $(BUILD_CGI) + sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) $(BUILD_CLI) diff --git a/sapi/cgi/config.m4 b/sapi/cgi/config.m4 index d3aa978264..2613195ab9 100644 --- a/sapi/cgi/config.m4 +++ b/sapi/cgi/config.m4 @@ -97,3 +97,13 @@ INCLUDES="$INCLUDES $FHTTPD_INCLUDE" dnl## AC_SUBST(FHTTPD_INCLUDE) PHP_SUBST(FHTTPD_LIB) PHP_SUBST(FHTTPD_TARGET) + +case $host_alias in + *darwin*) + BUILD_CGI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php" + ;; + *) + BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o php" + ;; +esac +PHP_SUBST(BUILD_CGI) |