diff options
| author | Steven Knight <knight@baldmt.com> | 2002-06-27 15:00:50 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-06-27 15:00:50 (GMT) |
| commit | 0cd4837fd6a10791576c5dcafa09514d47c0fc97 (patch) | |
| tree | fc4c551de3335992c11ccf2fdfde73d4d731a9bd /src/engine/SCons/Platform | |
| parent | 5dd473bc401492d93a372b03965f2718b05426b8 (diff) | |
| download | SCons-0cd4837fd6a10791576c5dcafa09514d47c0fc97.zip SCons-0cd4837fd6a10791576c5dcafa09514d47c0fc97.tar.gz SCons-0cd4837fd6a10791576c5dcafa09514d47c0fc97.tar.bz2 | |
Add support for assembly language (.s and .S) Tools. Still needs support for building shared objects.
Diffstat (limited to 'src/engine/SCons/Platform')
| -rw-r--r-- | src/engine/SCons/Platform/cygwin.py | 15 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/posix.py | 15 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 14 |
3 files changed, 38 insertions, 6 deletions
diff --git a/src/engine/SCons/Platform/cygwin.py b/src/engine/SCons/Platform/cygwin.py index 6a21ae9..8858dd1 100644 --- a/src/engine/SCons/Platform/cygwin.py +++ b/src/engine/SCons/Platform/cygwin.py @@ -32,9 +32,20 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import SCons.Util + def tool_list(): - return ['ar', 'dvipdf', 'dvips', 'g++', 'g77', 'gcc', 'latex', 'lex', - 'pdflatex', 'pdftex', 'tex', 'yacc', 'gnulink' ] + as = SCons.Util.WhereIs('as') + nasm = SCons.Util.WhereIs('nasm') + if nasm and not as: + assembler = 'nasm' + else: + assembler = 'gas' + return ['ar', 'dvipdf', 'dvips', + 'g++', 'g77', 'gcc', 'gnulink', + 'latex', 'lex', + 'pdflatex', 'pdftex', 'tex', 'yacc', + assembler] def generate(env): if not env.has_key('ENV'): diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py index 3d20263..79adebd 100644 --- a/src/engine/SCons/Platform/posix.py +++ b/src/engine/SCons/Platform/posix.py @@ -32,9 +32,20 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import SCons.Util + def tool_list(): - return ['ar', 'dvipdf', 'dvips', 'g++', 'g77', 'gcc', 'latex', 'lex', - 'pdflatex', 'pdftex', 'tex', 'yacc', 'gnulink' ] + as = SCons.Util.WhereIs('as') + nasm = SCons.Util.WhereIs('nasm') + if nasm and not as: + assembler = 'nasm' + else: + assembler = 'gas' + return ['ar', 'dvipdf', 'dvips', + 'g++', 'g77', 'gcc', 'gnulink', + 'latex', 'lex', + 'pdflatex', 'pdftex', 'tex', 'yacc', + assembler] def generate(env): if not env.has_key('ENV'): diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py index 9bcea18..957aead 100644 --- a/src/engine/SCons/Platform/win32.py +++ b/src/engine/SCons/Platform/win32.py @@ -32,9 +32,19 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import SCons.Util + def tool_list(): - return ['dvipdf', 'latex', 'dvips', 'g77', 'lex', 'lib', 'msvc', - 'pdflatex', 'pdftex', 'tex', 'yacc', 'mslink' ] + masm = SCons.Util.WhereIs('ml') + nasm = SCons.Util.WhereIs('nasm') + if nasm and not masm: + assembler = 'nasm' + else: + assembler = 'masm' + return ['dvipdf', 'dvips', 'g77', + 'latex', 'lex', 'lib', 'mslink', 'msvc', + 'pdflatex', 'pdftex', 'tex', 'yacc', + assembler] def generate(env): if not env.has_key('ENV'): |