diff options
author | Kenneth Heafield <github@kheafield.com> | 2012-10-09 14:30:31 +0400 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2012-10-09 14:30:31 +0400 |
commit | 650ad22c9c5929c4566d9205495377560af275c9 (patch) | |
tree | d2889c1d0e84f09babbec9eed4a8ac1a809efbc1 /jam-files | |
parent | 4bc4101def8420e71022a2cfe6afa2075246aaa1 (diff) | |
parent | e435ce23b55817811ef431c89157ea6d2107c904 (diff) |
Merge remote branch 'upstream/master'
Conflicts:
util/file.cc
util/file.hh
Diffstat (limited to 'jam-files')
-rw-r--r-- | jam-files/sanity.jam | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index ed4c38d2e..ab126c9fb 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -29,7 +29,7 @@ ldflags = [ os.environ "LDFLAGS" ] ; #Run g++ with empty main and these arguments to see if it passes. rule test_flags ( flags * ) { flags = $(cxxflags) $(ldflags) $(flags) ; - local cmd = "bash -c \"g++ "$(flags:J=" ")" -x c++ - <<<'int main() {}' -o /dev/null >/dev/null 2>/dev/null\"" ; + local cmd = "bash -c \"g++ "$(flags:J=" ")" -x c++ - <<<'int main() {}' -o $(TOP)/dummy >/dev/null 2>/dev/null && rm $(TOP)/dummy 2>/dev/null\"" ; local ret = [ SHELL $(cmd) : exit-status ] ; if --debug-configuration in [ modules.peek : ARGV ] { echo $(cmd) ; |