X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=6caece799b0f401421c767a5b259998c288d188f;hb=64557b454b1a184ef9ee177806a05b75c79c0eb6;hp=cb8d41ff4defdc49963a1dbb7b392b04147d5207;hpb=33653031263aa6d5ba4d481c8bb0d8eb1303f4d1;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index cb8d41f..6caece7 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -104,7 +104,12 @@ GhcDynamic=NO
 GhcProfiled=NO
 
 # Do we support shared libs?
-PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32 i386-apple-darwin powerpc-apple-darwin),YES,NO)
+PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),\
+	i386-unknown-linux x86_64-unknown-linux \
+	i386-unknown-freebsd x86_64-unknown-freebsd \
+	i386-unknown-openbsd x86_64-unknown-openbsd \
+	i386-unknown-mingw32 \
+	i386-apple-darwin powerpc-apple-darwin),YES,NO)
 
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
@@ -178,13 +183,19 @@ endif
 # Whether to use libffi for adjustors (foreign import "wrapper") or
 # not.  If we have built-in support (rts/Adjustor.c) then we use that,
 # otherwise we fall back on libffi, which is slightly slower.
-ArchHasAdjustorSupport=$(strip $(if $(findstring $(HostArch_CPP),i386 x86_64,),YES,NO))
+ArchHasAdjustorSupport = $(if $(findstring $(HostArch_CPP),i386 x86_64),YES,NO)
 ifeq "$(ArchHasAdjustorSupport)" "YES"
 UseLibFFIForAdjustors=NO
 else
 UseLibFFIForAdjustors=YES
 endif
 
+ifeq "$(findstring $(HostOS_CPP), darwin)" ""
+UseArchivesForGhci = NO
+else
+UseArchivesForGhci = YES
+endif
+
 # On Windows we normally want to make a relocatable bindist, to we
 # ignore flags like libdir
 ifeq "$(Windows)" "YES"