diff options
| author | Steven Knight <knight@baldmt.com> | 2002-09-05 00:04:32 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-09-05 00:04:32 (GMT) |
| commit | 246819663b8eaeb130580f4b97990248f26eaadd (patch) | |
| tree | f9ca305b654b4d35be2ba9a59bc85f341b916ac4 /src/engine/SCons/Tool/gas.py | |
| parent | 08ecd797ee635637097196960ea6a90e8dd29d62 (diff) | |
| download | SCons-246819663b8eaeb130580f4b97990248f26eaadd.zip SCons-246819663b8eaeb130580f4b97990248f26eaadd.tar.gz SCons-246819663b8eaeb130580f4b97990248f26eaadd.tar.bz2 | |
Fix the tests that broke from the tool auto-detect stuff. (Anthony Roach and SK)
Diffstat (limited to 'src/engine/SCons/Tool/gas.py')
| -rw-r--r-- | src/engine/SCons/Tool/gas.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/engine/SCons/Tool/gas.py b/src/engine/SCons/Tool/gas.py index 36672a1..a8c2864 100644 --- a/src/engine/SCons/Tool/gas.py +++ b/src/engine/SCons/Tool/gas.py @@ -41,13 +41,6 @@ import SCons.Util assemblers = ['as', 'gas'] -for i in assemblers: - if SCons.Util.WhereIs(i): - as = i - break - as = None - - ASSuffixes = ['.s', '.asm', '.ASM'] ASPPSuffixes = ['.spp', '.SPP'] if os.path.normcase('.s') == os.path.normcase('.S'): @@ -65,10 +58,10 @@ def generate(env, platform): for suffix in ASPPSuffixes: static_obj.add_action(suffix, SCons.Defaults.ASPPAction) - env['AS'] = as + env['AS'] = SCons.Util.Detect(assemblers, env) or 'as' env['ASFLAGS'] = '' env['ASCOM'] = '$AS $ASFLAGS -o $TARGET $SOURCES' env['ASPPCOM'] = '$CC $ASFLAGS $CPPFLAGS -o $TARGET $SOURCES' -def exists(): - return as +def exists(env): + return SCons.Util.Detect(assemblers, env) |