From 23de5d1c2063e5e986af99a2a6161e54fed78b3e Mon Sep 17 00:00:00 2001 From: Marko Karppinen Date: Mon, 1 Jul 2002 21:17:39 +0000 Subject: [PATCH] - You don't need libtool to build sapi/cli on Darwin. - We don't need libtool to build sapi/cli on Darwin. - You want the sapi/cli build line to be in sapi/cli, not Makefile.global. - We want the sapi/cli build line to be in sapi/cli, not Makefile.global. - He can go about his business. - You can go about your business. - Move along. - Move along. Move along. --- Makefile.global | 2 +- sapi/cli/config.m4 | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.global b/Makefile.global index 4352ede694..6fb768e5ab 100644 --- a/Makefile.global +++ b/Makefile.global @@ -20,7 +20,7 @@ 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 $@ sapi/cli/php: $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) - $(LIBTOOL) --mode=link $(CC) -export-dynamic $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + $(BUILD_CLI) install: $(install_targets) diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index 49aae6f58e..a7dc32264f 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -14,7 +14,16 @@ AC_ARG_ENABLE(cli, ]) if test "$PHP_SAPI_CLI" != "no"; then + case $host_alias in + *darwin*) + BUILD_CLI="\$(CC) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php" + ;; + *) + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o sapi/cli/php" + ;; + esac INSTALL_CLI="\$(INSTALL) -m 0755 sapi/cli/php \$(INSTALL_ROOT)\$(bindir)/php" + PHP_SUBST(BUILD_CLI) PHP_SUBST(INSTALL_CLI) else PHP_DISABLE_CLI -- 2.50.1