From 8365d941b7fa995460090fc590b85a7b03257ac4 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Fri, 3 Oct 2014 12:29:16 +0300 Subject: [PATCH] Allowed to build on Darwin. --- projects/rscriptd/Makefile | 7 ++++++- projects/rscriptd/build | 18 +++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile index adbc4eb3..4c960db7 100644 --- a/projects/rscriptd/Makefile +++ b/projects/rscriptd/Makefile @@ -31,7 +31,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 install uninstall all: libs $(PROG) ../../Makefile.conf diff --git a/projects/rscriptd/build b/projects/rscriptd/build index 59927348..451e08aa 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -51,6 +51,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" @@ -77,14 +84,19 @@ else if [ "$OS" = "bsd" ] then 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 -- 2.44.2