From 5a1629529c456e229027f569b5855ae51a6364c9 Mon Sep 17 00:00:00 2001 From: Adam Feuer Date: Wed, 10 Apr 2019 09:42:10 -0700 Subject: [PATCH 1/2] use libtool to create libraries on macOS --- Makefile | 3 ++- Makefile.config | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 28a6b2b8..99be6c59 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,8 @@ runtime.o : runtime.c $(HEADERS) $< -o $@ libcyclone.a : runtime.o gc.o dispatch.o mstreams.o hashset.o - $(AR) rcs $@ $^ + $(CREATE_LIBRARY_COMMAND) $(CREATE_LIBRARY_FLAGS) $@ $& + $(RANLIB_COMMAND) # Instructions from: http://www.adp-gmbh.ch/cpp/gcc/create_lib.html # Note compiler will have to link to this, eg: #Linking against static library diff --git a/Makefile.config b/Makefile.config index 06d13852..27c5327e 100644 --- a/Makefile.config +++ b/Makefile.config @@ -4,6 +4,8 @@ # # Configuration options for the makefile +& = $(filter-out %.h %.d,$^) + CYC_PROFILING ?= #CYC_PROFILING ?= -g -pg @@ -105,3 +107,4 @@ else PLATFORM=unix endif endif + From 870c1d649552903f3ee466ae85e782e2ab329084 Mon Sep 17 00:00:00 2001 From: Adam Feuer Date: Wed, 10 Apr 2019 09:46:58 -0700 Subject: [PATCH 2/2] remove unneeded newline --- Makefile.config | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.config b/Makefile.config index 27c5327e..7c016f2b 100644 --- a/Makefile.config +++ b/Makefile.config @@ -107,4 +107,3 @@ else PLATFORM=unix endif endif -