diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-25 19:50:09 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-10-03 12:11:28 +0100 |
| commit | 898cb090c8812704448ec4cb1c10d50df4b7d664 (patch) | |
| tree | 526c5f4b47aee447d91af7ce83a819863f105804 /rules/build-package.mk | |
| parent | 58eaacc9967b7c627a66d49047fb447ac065706e (diff) | |
| download | haskell-898cb090c8812704448ec4cb1c10d50df4b7d664.tar.gz | |
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/...
Diffstat (limited to 'rules/build-package.mk')
| -rw-r--r-- | rules/build-package.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/rules/build-package.mk b/rules/build-package.mk index c97f8c4b2c..d21f449d93 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -115,6 +115,13 @@ $$(foreach way,$$($1_$2_WAYS),$$(eval \ $$(call build-package-way,$1,$2,$$(way),$3) \ )) +# Programs will need to depend on either the vanilla lib (if -static +# is the default) or the dyn lib (if -dynamic is the default). We +# conservatively make them depend on both, to keep things simple. +# If dyn libs are not being built then $$($1_$2_dyn_LIB) will just +# expand to the empty string, and be ignored. +$1_$2_PROGRAM_DEP_LIB = $$($1_$2_v_LIB) $$($1_$2_dyn_LIB) + # C and S files are possibly built the "dyn" way. ifeq "$$(BuildSharedLibs)" "YES" $(call c-objs,$1,$2,dyn) |