From 3febe016d450f3cecd77d6ee866a9b98cab6571d Mon Sep 17 00:00:00 2001 From: Ian Lynagh <ian@well-typed.com> Date: Tue, 25 Sep 2012 19:50:09 +0100 Subject: [PATCH] Build the dynamic way by default on Linux/amd64 This required various build system changes to get the build to go through. In the inplace shell wrappers, we set LD_LIBRARY_PATH to allow programs to find their libraries. In the future, we might change the inplace tree to be the same shape as an installed tree instead. However, this would mean changing the way we do installation, as currently we use cabal's installation methods to install the libraries, but that only works if the libraries are under libraries/foo/dist-install/build/..., rather than in inplace/lib/... --- ghc.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ghc.mk b/ghc.mk index 9a8f8ad..2485e16 100644 --- a/ghc.mk +++ b/ghc.mk @@ -13,7 +13,8 @@ utils/hpc_dist-install_MODULES = Main HpcCombine HpcDraft HpcFlags HpcLexer \ HpcMarkup HpcOverlay HpcParser HpcReport \ HpcShowTix HpcUtils -utils/hpc_dist-install_HC_OPTS = -cpp -package hpc -utils/hpc_dist-install_INSTALL = YES -utils/hpc_dist-install_PROG = hpc$(exeext) +utils/hpc_dist-install_HC_OPTS = -cpp -package hpc +utils/hpc_dist-install_INSTALL = YES +utils/hpc_dist-install_INSTALL_INPLACE = YES +utils/hpc_dist-install_PROG = hpc$(exeext) $(eval $(call build-prog,utils/hpc,dist-install,1)) -- GitLab