diff options
| author | Steven Knight <knight@baldmt.com> | 2005-02-27 21:32:06 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-02-27 21:32:06 (GMT) |
| commit | 044cbbb97a8df13cc3bf67e9e0188328862ba49b (patch) | |
| tree | 2aecab9d9f780e64b69d172e697b902072c629af | |
| parent | f40d9280448cfad8ed681a0f89eb0b8371c552a5 (diff) | |
| download | SCons-044cbbb97a8df13cc3bf67e9e0188328862ba49b.zip SCons-044cbbb97a8df13cc3bf67e9e0188328862ba49b.tar.gz SCons-044cbbb97a8df13cc3bf67e9e0188328862ba49b.tar.bz2 | |
Remove the space after the -o option when invoking the Borland BCC compiler. (Georg Mischler)
| -rw-r--r-- | src/CHANGES.txt | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/bcc32.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3acb1cc..ae19676 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -240,6 +240,12 @@ RELEASE 0.97 - XXX - Improve SWIG tests for use on Mac OS X (Darwin). + From Georg Mischler: + + - Remove the space after the -o option when invoking the Borland + BCC compiler; some versions apparently require that the file name + argument be concatenated with the option. + From Elliot Murphy: - Enhance the tests to guarantee persistence of ListOption diff --git a/src/engine/SCons/Tool/bcc32.py b/src/engine/SCons/Tool/bcc32.py index f891d45..826373f 100644 --- a/src/engine/SCons/Tool/bcc32.py +++ b/src/engine/SCons/Tool/bcc32.py @@ -63,10 +63,10 @@ def generate(env): env['CC'] = 'bcc32' env['CCFLAGS'] = SCons.Util.CLVar('') - env['CCCOM'] = '$CC -q $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES' + env['CCCOM'] = '$CC -q $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o$TARGET $SOURCES' env['SHCC'] = '$CC' env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS') - env['SHCCCOM'] = '$SHCC -WD $SHCCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES' + env['SHCCCOM'] = '$SHCC -WD $SHCCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -c -o$TARGET $SOURCES' env['CPPDEFPREFIX'] = '-D' env['CPPDEFSUFFIX'] = '' env['INCPREFIX'] = '-I' |