ifneq "$(PACKAGE)" ""
-# FIXME: does anyone do this any more?
-STANDALONE_PACKAGE = NO
-
# -----------------------------------------------------------------------------
# Directory layouts, installation etc.
ifeq "$(way)" ""
-ifeq "$(STANDALONE_PACKAGE)" "NO"
PACKAGE_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -Iinclude
-else
-PACKAGE_CPP_OPTS += -Iinclude
-endif
PACKAGE_CPP_OPTS += -DPACKAGE=${PACKAGE}
PACKAGE_CPP_OPTS += -DVERSION=${VERSION}
# to 'make clean' in ghc without cleaning in libraries too, the packages
# will be correctly re-installed.
#
-ifeq "$(STANDALONE_PACKAGE)" "NO"
STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
CLEAN_FILES += $(STAMP_PKG_CONF)
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 # $(STANDALONE_PACKAGE)
-
endif # $(way) == ""
# -----------------------------------------------------------------------------
SRC_HSC2HS_OPTS += -I.
-ifeq "$(STANDALONE_PACKAGE)" "NO"
+ifneq "$(NO_SET_HC)" "YES"
HC = $(GHC_INPLACE)
+endif
IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION)
-else
-# Only use -ignore-package if supported by HC; i.e., ghc-6.3 and later.
-# (Don't like the use of slow $(shell ..) in Makefiles, but can't see a way around it here.)
-ifeq "$(strip $(GHC))" ""
-IGNORE_PACKAGE_FLAG = -ignore-package $(PACKAGE)
-else
-# Making the assumption here that standalone packages will be using mk/config.mk:GHC
-IGNORE_PACKAGE_FLAG = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi) $(PACKAGE)
-endif
-endif # STANDALONE_PACKAGE
ifeq "$(NON_HS_PACKAGE)" ""
SRC_HC_OPTS += $(IGNORE_PACKAGE_FLAG)
# -----------------------------------------------------------------------------
# Dependencies
-ifeq "$(STANDALONE_PACKAGE)" "NO"
MKDEPENDHS = $(GHC_INPLACE)
-endif
SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS))
-
-ifeq "$(STANDALONE_PACKAGE)" "NO"
SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
-endif
endif # $(PACKAGE) != ""
# 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.
# 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))