diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-01-03 22:36:37 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-01-03 22:36:37 +0000 |
| commit | cd24d61675e2f5c9145efcac62f64347789e583c (patch) | |
| tree | 7c6694acd631be8d5ee8b84f1d10e4cf4a7e3e6e /compiler/utils/Util.lhs | |
| parent | b06d623b2e367a572de5daf06d6a0b12c2740471 (diff) | |
| download | haskell-cd24d61675e2f5c9145efcac62f64347789e583c.tar.gz | |
locateOneObj: don't look for dynamic libs in static mode
also replace picIsOn with isDynamicGhcLib, as __PIC__ is not the
correct test for whether the GHC library is dynamically linked.
Diffstat (limited to 'compiler/utils/Util.lhs')
| -rw-r--r-- | compiler/utils/Util.lhs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/utils/Util.lhs b/compiler/utils/Util.lhs index 69b8c7ed32..81fc0fe873 100644 --- a/compiler/utils/Util.lhs +++ b/compiler/utils/Util.lhs @@ -7,7 +7,7 @@ -- | Highly random utility functions module Util ( -- * Flags dependent on the compiler build - ghciSupported, debugIsOn, ghciTablesNextToCode, picIsOn, + ghciSupported, debugIsOn, ghciTablesNextToCode, isDynamicGhcLib, isWindowsHost, isWindowsTarget, isDarwinTarget, -- * General list processing @@ -141,11 +141,11 @@ ghciTablesNextToCode = True ghciTablesNextToCode = False #endif -picIsOn :: Bool -#ifdef __PIC__ -picIsOn = True +isDynamicGhcLib :: Bool +#ifdef DYNAMIC +isDynamicGhcLib = True #else -picIsOn = False +isDynamicGhcLib = False #endif isWindowsHost :: Bool |