From eb2ce0293138532680fdd3647c01db7587b9367b Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Mon, 9 Feb 2015 11:57:41 -0800 Subject: Fix absolute/relative path in output --- src/google/protobuf/compiler/command_line_interface.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/google/protobuf/compiler/command_line_interface.cc') diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc index ddd58e2d..4095b3c9 100644 --- a/src/google/protobuf/compiler/command_line_interface.cc +++ b/src/google/protobuf/compiler/command_line_interface.cc @@ -1344,7 +1344,11 @@ bool CommandLineInterface::GenerateDependencyManifestFile( vector relative_output_filenames; directory->GetOutputFilenames(&relative_output_filenames); for (int i = 0; i < relative_output_filenames.size(); i++) { - output_filenames.push_back(location + relative_output_filenames[i]); + string output_filename = location + relative_output_filenames[i]; + if (output_filename.compare(0, 2, "./") == 0) { + output_filename = output_filename.substr(2); + } + output_filenames.push_back(output_filename); } } -- cgit v1.2.3