Permalink
Browse files

fix clang HEAD is broken. (#190)

  • Loading branch information...
1 parent 62ec354 commit b12bdd56f07c27a87066a10f4ace3b9268346000 @melpon committed Nov 23, 2016
Showing with 13 additions and 11 deletions.
  1. +5 −6 cattleshed/compilers.default
  2. +5 −5 cattleshed/compilers.py
  3. +3 −0 cattleshed/src/server.cc
@@ -2449,15 +2449,14 @@
"-fansi-escape-codes",
"-fcolor-diagnostics",
"-stdlib=libc++",
- "-I/usr/local/libcxx-head/include/c++/v1",
- "-L/usr/local/libcxx-head/lib",
+ "-I/usr/local/llvm-head/include/c++/v1",
+ "-L/usr/local/llvm-head/lib",
"-I/usr/local/boost-sml/include",
"-I/usr/local/range-v3/include",
- "-Wl,-rpath,/usr/local/libcxx-head/lib",
+ "-Wl,-rpath,/usr/local/llvm-head/lib",
"-nostdinc++",
"-lpthread",
- "prog.cc",
- "-lsupc++"
+ "prog.cc"
],
"name": "clang-head",
"language": "C++",
@@ -2476,7 +2475,7 @@
"version-command": [
"/bin/sh",
"-c",
- "LD_LIBRARY_PATH=/usr/local/gcc-4.8.2/lib64 /usr/local/llvm-head/bin/clang++ --version | head -1 | cut -d' ' -f3-"
+ "LD_LIBRARY_PATH=/usr/local/gcc-5.2.0/lib64 /usr/local/llvm-head/bin/clang++ --version | head -1 | cut -d' ' -f3-"
]
},
{
@@ -483,18 +483,18 @@ def make_clang(self):
"-fansi-escape-codes",
"-fcolor-diagnostics",
"-stdlib=libc++",
- "-I/usr/local/libcxx-head/include/c++/v1",
- "-L/usr/local/libcxx-head/lib",
+ "-I/usr/local/llvm-head/include/c++/v1",
+ "-L/usr/local/llvm-head/lib",
"-I/usr/local/boost-sml/include",
"-I/usr/local/range-v3/include",
- "-Wl,-rpath,/usr/local/libcxx-head/lib",
+ "-Wl,-rpath,/usr/local/llvm-head/lib",
"-nostdinc++",
"-lpthread",
"prog.cc"
],
- "version-command":["/bin/sh", "-c", "LD_LIBRARY_PATH=/usr/local/gcc-4.8.2/lib64 /usr/local/llvm-head/bin/clang++ --version | head -1 | cut -d' ' -f3-"],
+ "version-command":["/bin/sh", "-c", "LD_LIBRARY_PATH=/usr/local/gcc-5.2.0/lib64 /usr/local/llvm-head/bin/clang++ --version | head -1 | cut -d' ' -f3-"],
},
- "lsupc++": True,
+ "lsupc++": False,
}),
("clang-3.8", {
"params": {
@@ -670,6 +670,7 @@ namespace wandbox {
if (current.version_command.empty() || not current.displayable) continue;
{
auto c = piped_spawn(opendir("/"), current.version_command);
+ std::clog << "[" << sock.get() << "]" << "run [" << boost::algorithm::join(move(current.version_command), ", ") << "]" << std::endl;
child = std::make_shared<unique_child_pid>(move(c.pid));
pipe_stdout = std::make_shared<asio::posix::stream_descriptor>(*aio, c.fd_stdout.get());
c.fd_stdout.release();
@@ -684,6 +685,7 @@ namespace wandbox {
{
int st = child->wait_nonblock();
+ std::cout << "[" << sock.get() << "]" << "WIFEXITED(st): " << WIFEXITED(st) << ", WEXITSTATUS(st): " << WEXITSTATUS(st) << std::endl;
if (!WIFEXITED(st) || (WEXITSTATUS(st) != 0)) continue;
}
@@ -698,6 +700,7 @@ namespace wandbox {
std::istream is(buf.get());
std::string ver;
if (!getline(is, ver)) continue;
+ std::cout << "[" << sock.get() << "]" << "add version: " << ver << std::endl;
versions.emplace_back(generate_displaying_compiler_config(move(current), ver, config.switches));
}
}

0 comments on commit b12bdd5

Please sign in to comment.