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

diff --git a/mk/package.mk b/mk/package.mk
index e2058f7..72bb437 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)" ""
@@ -292,6 +277,9 @@ DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY))
     #   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.
+    # -undefined dynamic_lookup:
+    #   Another way to avoid having to specify the correct dependencies, but
+    #   this time, we don't allow overriding symbols.
     # -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.
@@ -302,7 +290,7 @@ DYLD_LIBRARY = $(patsubst %.a,%_dyn.dylib,$(LIBRARY))
     #         library dir. -- Wolfgang
 
 $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
-	$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -flat_namespace -undefined suppress -install_name `pwd`/$@
+	$(CC) -dynamiclib -o $@ $(STUBOBJS) $(LIBOBJS) -undefined dynamic_lookup -install_name `pwd`/$@
 else
 DYLD_LIBRARY = $(patsubst %.a,%_dyn.so,$(LIBRARY))