X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=29fdb99b7bbef063a5468af20b8d926cbae83ee1;hp=e2058f799c5598baf5193bbcf74efa06e21d9c03;hb=fd1375dd261725eb00969a3017b924369c09835c;hpb=fb0318e2bbe527464ed6d19cc292121fe88b2636

diff --git a/mk/package.mk b/mk/package.mk
index e2058f7..29fdb99 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -117,23 +117,6 @@ $(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed
 
 CLEAN_FILES += package.conf.installed package.conf.inplace 
 
-else # $(STANDALONE_PACKAGE) == "YES"
-
-PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(subst " ","$(comma) ",$(patsubst %,"%",$(PACKAGE_DEPS)))'
-PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
-PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
-
-# Let the package configuration file refer to $(libdir) as
-# ${pkglibdir}.  Note we can't use ${libdir} because ghc-pkg already
-# redefines it to point to GHC's libdir (bug or feature?).
-#
-install :: package.conf.installed
-	$(GHC_PKG) --force --update-package <package.conf.installed
-
-# Invoke this rule by hand in order to use the package in-place
-install-inplace-pkg : package.conf.inplace
-	$(GHC_PKG) --force --update-package <package.conf.inplace
-
 endif # $(way) == ""
 
 # -----------------------------------------------------------------------------
@@ -141,7 +124,9 @@ endif # $(way) == ""
 
 SRC_HSC2HS_OPTS += -I.
 
+ifneq "$(NO_SET_HC)" "YES"
 HC = $(GHC_INPLACE)
+endif
 IGNORE_PACKAGE_FLAG = -package-name  $(PACKAGE)-$(VERSION)
 
 ifeq "$(NON_HS_PACKAGE)" ""
@@ -288,21 +273,35 @@ DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY))
     # About the options used for Darwin:
     # -dynamiclib
     #   Apple's way of saying -shared
-    # -flat_namespace -undefined suppress:
+    # -undefined dynamic_lookup:
     #   Without these options, we'd have to specify the correct dependencies
-    #   for each of the dylibs. Twolevel namespaces are in general a good thing
-    #   (they make things more robust), so we should fix this sooner or later.
+    #   for each of the dylibs. Note that we could (and should) do without this
+    #	for all libraries except the RTS; all we need to do is to pass the
+    #	correct HSfoo_dyn.dylib files to the link command.
+    #	This feature requires Mac OS X 10.3 or later; there is a similar feature,
+    #	-flat_namespace -undefined suppress, which works on earlier versions,
+    #	but it has other disadvantages.
+    # -single_module
+    #	Build the dynamic library as a single "module", i.e. no dynamic binding
+    #	nonsense when referring to symbols from within the library. The NCG
+    #	assumes that this option is specified (on i386, at least).
+    # -Wl,-macosx_version_min -Wl,10.3
+    #	Tell the linker its safe to assume that the library will run on 10.3 or
+    #	later, so that it will not complain about the use of the option
+    #	-undefined dynamic_lookup above.
     # -install_name
     #   Causes the dynamic linker to ignore the DYLD_LIBRARY_PATH when loading
     #   this lib and instead look for it at its absolute path.
     #   When installing the .dylibs (see target.mk), we'll change that path to
-    #   point to the place they are installed.
-    #   Note: I'm not yet sure about this, but I think it will be convenient for
-    #         users not to have to set up DYLD_LIBRARY_PATH to point to the GHC
-    #         library dir. -- Wolfgang
+    #   point to the place they are installed. Therefore, we won't have to set
+    #	up DYLD_LIBRARY_PATH specifically for ghc.
 
 $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
-	$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@
+	$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) \
+		-undefined dynamic_lookup -single_module \
+		 -Wl,-macosx_version_min -Wl,10.3 \
+		-install_name `pwd`/$@
+
 else
 DYLD_LIBRARY = $(patsubst %.a,%_dyn.so,$(LIBRARY))