- version = strip(ExternalTask::run_and_capture_output(argv));
- builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
+ string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
+ string::size_type start = 0;
+ bool record_path = false;
+ while(start<output.size())
+ {
+ string::size_type newline = output.find('\n', start);
+ if(!output.compare(start, 34, "#include <...> search starts here:"))
+ {
+ record_path = true;
+ path_found = true;
+ }
+ else if(!output.compare(start, 19, "End of search list."))
+ record_path = false;
+ else if(record_path)
+ {
+ FS::Path path = strip(output.substr(start, newline-start));
+ builder.get_logger().log("tools", "Got %s system path: %s", tag, path);
+ system_path.push_back(path);
+ }
+ start = newline+1;
+ }