[cig-commits] commit: Luke asked me to commit this.

[Mercurial]

changeset:   26:3d752e5c98d7
user:        LukeHodkinson
date:        Tue Feb 12 03:18:34 2008 +0000
files:       SConfigure
description:
Luke asked me to commit this.


diff -r aae43104d6c8 -r 3d752e5c98d7 SConfigure
--- a/SConfigure	Mon Feb 11 03:15:38 2008 +0000
+++ b/SConfigure	Tue Feb 12 03:18:34 2008 +0000
@@ -32,13 +32,16 @@ void METHOD(int *i){printf("FORTRAN_UPPE
     oldLINK = env['LINK'] if 'LINK' in env._dict else None
     oldLINKFLAGS = env['LINKFLAGS'] if 'LINKFLAGS' in env._dict else None
     oldLIBS = env['LIBS'] if 'LIBS' in env._dict else None
+    oldFW = env._dict.get('FRAMEWORKS', '')
     env['LINK'] = env['_FORTRAND']
     env['LINKFLAGS'] = str(cObj)
     env['LIBS'] = []
+    env['FRAMEWORKS'] = []
     res = ctx.TryRun(fSrc, '.F')
     env['LINK'] = oldLINK
     env['LINKFLAGS'] = oldLINKFLAGS
     env['LIBS'] = oldLIBS
+    env['FRAMEWORKS'] = oldFW
     if not res[0]:
         ctx.Result(res[0])
         return res[0]
@@ -153,6 +156,13 @@ if not env.GetOption('clean'):
             bits = 64 if \
                 platform.architecture()[0].find('64') != -1 else 32
         print '%dbit ...' % bits
+
+    #
+    # Need to modify building shared libraries when on Mac OS X.
+    #
+
+    if platform.system() == 'Darwin':
+	env.AppendUnique(SHLINKFLAGS=['-flat_namespace', '-single_module', '-undefined', 'suppress'])
 
     #
     # Check for the C math library.