[cig-commits] commit:

Mercurial hg at geodynamics.org
Mon Nov 24 11:58:20 PST 2008


changeset:   25:bdb6d1414317
user:        LukeHodkinson
date:        Wed Jan 30 07:02:40 2008 +0000
files:       SConfigure
description:
Making sure we add library checks to existing
libraries.


diff -r 91b50340d74f -r bdb6d1414317 SConfigure
--- a/SConfigure	Wed Jan 30 06:59:54 2008 +0000
+++ b/SConfigure	Wed Jan 30 07:02:40 2008 +0000
@@ -184,8 +184,8 @@ return (MPI_VERSION == 2) ? 0 : 1;
 }
 """
     old = env['LIBS'], env['RPATH']
-    env.Replace(LIBS=libs)
-    env.Replace(RPATH=libpath)
+    env.Append(LIBS=libs)
+    env.Append(RPATH=libpath)
     res = ctx.TryRun(src, '.c')[0]
     env.Replace(LIBS=old[0])
     env.Replace(RPATH=old[1])
@@ -228,7 +228,7 @@ return 0;
 }
 """
     old = env['LIBS']
-    env.Replace(LIBS=libs)
+    env.Append(LIBS=libs)
     res = ctx.TryLink(src, '.c')
     env.Replace(LIBS=old)
     if not res:
@@ -270,7 +270,7 @@ return 0;
 }
 """
     old = env['LIBS']
-    env.Replace(LIBS=libs)
+    env.Append(LIBS=libs)
     res = ctx.TryLink(src, '.c')
     env.Replace(LIBS=old)
     if not res:
@@ -305,7 +305,7 @@ return 0;
 }
 """
     old = env['LIBS']
-    env.Replace(LIBS=libs)
+    env.Append(LIBS=libs)
     res = ctx.TryLink(src, '.c')
     env.Replace(LIBS=old)
     if not res:



More information about the CIG-COMMITS mailing list