[commit: ghc] master: The non-dynamic ways now need to explicitly use -static (7c0b518)

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7c0b5182d30b2c1ca31eb288724d9f72bfd580ee

>---------------------------------------------------------------

commit 7c0b5182d30b2c1ca31eb288724d9f72bfd580ee
Author: Ian Lynagh <[email protected]>
Date:   Wed Oct 3 13:12:23 2012 +0100

    The non-dynamic ways now need to explicitly use -static
    
    as x86_64/Linux now defaults to -dynamic

>---------------------------------------------------------------

 mk/ways.mk |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mk/ways.mk b/mk/ways.mk
index c2dcf07..1270a28 100644
--- a/mk/ways.mk
+++ b/mk/ways.mk
@@ -34,23 +34,23 @@ ALL_WAYS=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr
 
 # Way 'v':
 WAY_v_NAME=vanilla
-WAY_v_HC_OPTS= 
+WAY_v_HC_OPTS= -static
 
 # Way 'p':
 WAY_p_NAME=profiling
-WAY_p_HC_OPTS= -prof
+WAY_p_HC_OPTS= -static -prof
 
 # Way 'l':
 WAY_l_NAME=event logging
-WAY_l_HC_OPTS= -eventlog
+WAY_l_HC_OPTS= -static -eventlog
 
 # Way `mp': 
 WAY_mp_NAME=parallel
-WAY_mp_HC_OPTS=-parallel
+WAY_mp_HC_OPTS= -static -parallel
 
 # Way `mg': 
 WAY_mg_NAME=GranSim
-WAY_mg_HC_OPTS=-gransim
+WAY_mg_HC_OPTS= -static -gransim
 
 #
 # These ways apply to the RTS only:
@@ -58,31 +58,31 @@ WAY_mg_HC_OPTS=-gransim
 
 # Way 'thr':
 WAY_thr_NAME=threaded
-WAY_thr_HC_OPTS=-optc-DTHREADED_RTS
+WAY_thr_HC_OPTS= -static -optc-DTHREADED_RTS
 
 # Way 'thr_p':
 WAY_thr_p_NAME=threaded profiled
-WAY_thr_p_HC_OPTS=-optc-DTHREADED_RTS -prof
+WAY_thr_p_HC_OPTS= -static -optc-DTHREADED_RTS -prof
 
 # Way 'thr_l':
 WAY_thr_l_NAME=threaded event logging
-WAY_thr_l_HC_OPTS=-optc-DTHREADED_RTS -eventlog
+WAY_thr_l_HC_OPTS= -static -optc-DTHREADED_RTS -eventlog
 
 # Way 'debug':
 WAY_debug_NAME=debug
-WAY_debug_HC_OPTS=-optc-DDEBUG
+WAY_debug_HC_OPTS= -static -optc-DDEBUG
 
 # Way 'debug_p':
 WAY_debug_p_NAME=debug profiled
-WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
+WAY_debug_p_HC_OPTS= -static -optc-DDEBUG -prof
 
 # Way 'thr_debug':
 WAY_thr_debug_NAME=threaded
-WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG
+WAY_thr_debug_HC_OPTS= -static -optc-DTHREADED_RTS -optc-DDEBUG
 
 # Way 'thr_debug_p':
 WAY_thr_debug_p_NAME=threaded debug profiling
-WAY_thr_debug_p_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -prof
+WAY_thr_debug_p_HC_OPTS= -static -optc-DTHREADED_RTS -optc-DDEBUG -prof
 
 # Way 'dyn': build dynamic shared libraries
 WAY_dyn_NAME=dyn