diff options
| author | David Cournapeau <cournape@gmail.com> | 2008-09-03 08:32:35 (GMT) |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2008-09-03 08:32:35 (GMT) |
| commit | 0634aae20e1baea6ba5fcbc5d0272e6f927e11c4 (patch) | |
| tree | 2b009bd3e54413e76e457119d665e275e65b0c3c | |
| parent | b5620ed4c07023f0c1dac53acc7bef5f32159f84 (diff) | |
| download | SCons-0634aae20e1baea6ba5fcbc5d0272e6f927e11c4.zip SCons-0634aae20e1baea6ba5fcbc5d0272e6f927e11c4.tar.gz SCons-0634aae20e1baea6ba5fcbc5d0272e6f927e11c4.tar.bz2 | |
Use our CompileSharedObject builder in CheckSH* (fix tests failure).
| -rw-r--r-- | src/engine/SCons/Conftest.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/engine/SCons/Conftest.py b/src/engine/SCons/Conftest.py index d9db957..ba7dbf1 100644 --- a/src/engine/SCons/Conftest.py +++ b/src/engine/SCons/Conftest.py @@ -178,7 +178,7 @@ int foo() return 0; } """ - ret = _check_empty_program(context, 'SHCC', text, 'C') + ret = _check_empty_program(context, 'SHCC', text, 'C', use_shared = True) _YesNoResult(context, ret, None, text) return ret @@ -218,11 +218,11 @@ int main() return 0; } """ - ret = _check_empty_program(context, 'SHCXX', text, 'C++') + ret = _check_empty_program(context, 'SHCXX', text, 'C++', use_shared = True) _YesNoResult(context, ret, None, text) return ret -def _check_empty_program(context, comp, text, language): +def _check_empty_program(context, comp, text, language, use_shared = False): """Return 0 on success, 1 otherwise.""" if not context.env.has_key(comp) or not context.env[comp]: # The compiler construction variable is not set or empty @@ -232,7 +232,10 @@ def _check_empty_program(context, comp, text, language): if msg: return 1 - return context.CompileProg(text, suffix) + if use_shared: + return context.CompileSharedObject(text, suffix) + else: + return context.CompileProg(text, suffix) def CheckFunc(context, function_name, header = None, language = None): |