diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-12-04 14:36:14 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-12-04 14:36:14 +0000 |
| commit | 3e18f8be62b06c846b52d79717f79d51e2060593 (patch) | |
| tree | 23ec97dd15bb48f3dd78f09c76c4894ac86a88d3 /ghc.mk | |
| parent | 5c2220aa9aac0fefcba5abbfa3059a6ef138655f (diff) | |
| download | haskell-3e18f8be62b06c846b52d79717f79d51e2060593.tar.gz | |
Link all dynamic libraries with the correct install_name on Mac OS/X.
This is a rerecord of
Stephen Blackheath <oversensitive.pastors.stephen@blacksapphire.com>**20090930222855
to avoid conflicts.
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -751,9 +751,6 @@ install_bins: $(INSTALL_BINS) $(INSTALL_DIR) "$(DESTDIR)$(bindir)" for i in $(INSTALL_BINS); do \ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ; \ - if test "$(darwin_TARGET_OS)" = "1"; then \ - sh mk/fix_install_names.sh $(ghclibdir) "$(DESTDIR)$(bindir)/$$i" ; \ - fi ; \ done install_libs: $(INSTALL_LIBS) @@ -768,8 +765,7 @@ install_libs: $(INSTALL_LIBS) *.so) \ $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ *.dylib) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ - install_name_tool -id "$(DESTDIR)$(ghclibdir)/`basename $$i`" "$(DESTDIR)$(ghclibdir)/`basename $$i`" ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)";; \ *) \ $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ esac; \ @@ -930,7 +926,6 @@ $(eval $(call bindist,.,\ $(wildcard libraries/*/dist-install/doc/) \ $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \ $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \ - mk/fix_install_names.sh \ mk/project.mk \ mk/install.mk.in \ bindist.mk \ |