From: Maxim Mamontov Date: Fri, 3 Oct 2014 09:35:49 +0000 (+0300) Subject: Allowed to build on Darwin. X-Git-Tag: 2.409~243 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/ebe4af54bde52ca8182e97a3dc8d25449b9c1dbc Allowed to build on Darwin. --- diff --git a/projects/sgconv/Makefile b/projects/sgconv/Makefile index 794114c7..ceea22b7 100644 --- a/projects/sgconv/Makefile +++ b/projects/sgconv/Makefile @@ -32,7 +32,12 @@ OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS)))) CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS) CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS) -LDFLAGS += -Wl,-E $(STGLIBS_LIBS) + +ifneq ($(OS),darwin) +LDFLAGS += -Wl,-E +endif + +LDFLAGS += $(STGLIBS_LIBS) .PHONY: all clean distclean libs plugins install uninstall all: libs plugins $(PROG) ../../Makefile.conf diff --git a/projects/sgconv/build b/projects/sgconv/build index aa826138..3c337df8 100755 --- a/projects/sgconv/build +++ b/projects/sgconv/build @@ -52,6 +52,13 @@ then MAKE="gmake" fi +if [ "$sys" = "Darwin" ] +then + OS=darwin + ETC_DIR="./inst/freebsd/etc/stargazer" + MAKE="gmake" +fi + if [ "$OS" = "unknown" ] then printf "#############################################################################\n" @@ -83,12 +90,18 @@ else DEFS="$DEFS -DFREE_BSD" LIB_THREAD=-lc_r else - DEFS="$DEFS -DFREE_BSD5" if [ "$OS" = "bsd7" ] then + DEFS="$DEFS -DFREE_BSD5" LIB_THREAD=-lpthread else - LIB_THREAD=-lc_r + if [ "$OS" == "darwin" ] + then + DEFS="$DEFS -DDARWIN" + LIB_THREAD=-lpthread + else + LIB_THREAD=-lc_r + fi fi fi fi @@ -160,6 +173,7 @@ fi rm -f fake printf "Checking for mysql_config... " +printf "#include \nint main() { return 0; }\n" > build_check.c MYSQL_VERSION=`mysql_config --version 2> /dev/null` if [ $? != 0 ] then @@ -199,6 +213,7 @@ else fi printf "Checking for pg_config... " +printf "#include \nint main() { return 0; }\n" > build_check.c PG_VERSION=`pg_config --version 2> /dev/null` if [ $? != 0 ] then