From 9f4792ce0b7a64d5d1e0444100127a08871e87c4 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Fri, 19 Dec 2008 13:15:31 +0000
Subject: [PATCH] Fix LIBADDSUFFIX support
---
SConstruct | 2 +-
senfscons/SENFSCons.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SConstruct b/SConstruct
index 1fd2ac8f6..a898d6c0a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -198,7 +198,7 @@ SENFSCons.DoxyXRef(env,
SENFSCons.InstallIncludeFiles(env, [ 'config.hh' ])
# Build combined library 'libsenf'
-libsenf = env.Library(env['LIBSENF'], env['ALLOBJECTS'])
+libsenf = env.Library(env.subst("$LIBSENF$LIBADDSUFFIX"), env['ALLOBJECTS'])
env.Default(libsenf)
env.Clean('all', libsenf)
env.Alias('default', libsenf)
diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index a16251edb..32a5cc75b 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -356,7 +356,7 @@ def Test(env, sources, LIBS = [], OBJECTS = []):
target = 'test',
objects = [],
test_sources = sources,
- LIBS = [ '$LIBSENF' ],
+ LIBS = [ '$LIBSENF$LIBADDSUFFIX' ],
OBJECTS = OBJECTS,
DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ]
compileTestSources = [ src for src in sources
@@ -408,7 +408,7 @@ def Objects(env, sources, testSources = None, OBJECTS = []):
target = 'test',
objects = objects,
test_sources = testSources,
- LIBS = [ '$LIBSENF' ],
+ LIBS = [ '$LIBSENF$LIBADDSUFFIX' ],
OBJECTS = OBJECTS,
DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ]
compileTestSources = [ src for src in testSources
@@ -668,7 +668,7 @@ def Binary(env, binary, sources, testSources = None, OBJECTS = []):
program = None
if objects:
progEnv = env.Clone()
- progEnv.Prepend(LIBS = [ '$LIBSENF' ])
+ progEnv.Prepend(LIBS = [ '$LIBSENF$LIBADDSUFFIX' ])
program = progEnv.ProgramNoScan(target=binary,source=objects+OBJECTS)
env.Default(program)
env.Depends(program, [ env.File(LibPath(env['LIBSENF'])) ])
--
GitLab