[commit: testsuite] master: Don't use the dyn way if we're dynamic by default (63465d1)

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/63465d1c01324b29351f637b922e85de3602c678

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

commit 63465d1c01324b29351f637b922e85de3602c678
Author: Ian Lynagh <[email protected]>
Date:   Thu Oct 4 22:47:19 2012 +0100

    Don't use the dyn way if we're dynamic by default
    
    'normal' and 'optasm' are using dynamic libs anyway, so no point
    having another way for it.

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

 config/ghc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/ghc b/config/ghc
index c2f80f8..ee6b493 100644
--- a/config/ghc
+++ b/config/ghc
@@ -52,12 +52,12 @@ if (ghc_with_threaded_rts == 1):
         config.have_smp = True
         config.run_ways.append('threaded2')
 
-if (ghc_with_dynamic_rts == 1):
-    config.have_shared_libs = True
-    config.run_ways.append('dyn')
-
 if (ghc_dynamic_by_default == 1):
     config.run_ways.append('static')
+else:
+    if (ghc_with_dynamic_rts == 1):
+        config.have_shared_libs = True
+        config.run_ways.append('dyn')
 
 if (ghc_with_profiling == 1 and ghc_with_threaded_rts == 1):
     config.run_ways.append('profthreaded')