| Index: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
|
| diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
|
| index 19b0cdcbae80dc46c932769efc7936126837d93e..d370d6767f5134466f88638a1aa41a7391775141 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
|
| +++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
|
| @@ -409,8 +409,9 @@ void PnaclCoordinator::RunTranslate(int32_t pp_error,
|
| namespace {
|
|
|
| // Fake filename for the object file generated by llvm.
|
| -const nacl::string kGeneratedObjectFileName =
|
| - nacl::string("___PNACL_GENERATED");
|
| +nacl::string GeneratedObjectFileName() {
|
| + return nacl::string("___PNACL_GENERATED");
|
| +}
|
|
|
| string_vector LinkResources(const nacl::string& sandbox_isa,
|
| bool withGenerated) {
|
| @@ -419,7 +420,7 @@ string_vector LinkResources(const nacl::string& sandbox_isa,
|
|
|
| // NOTE: order of items == link order.
|
| if (withGenerated) {
|
| - results.push_back(kGeneratedObjectFileName);
|
| + results.push_back(GeneratedObjectFileName());
|
| }
|
| results.push_back(base_dir + "/libcrt_platform.a");
|
| results.push_back(base_dir + "/libgcc.a");
|
| @@ -512,7 +513,7 @@ void WINAPI DoLinkThread(void* arg) {
|
| link_file + ") failed.");
|
| }
|
| // Also map the file name to descriptor.
|
| - if (i->compare(kGeneratedObjectFileName) == 0) {
|
| + if (i->compare(GeneratedObjectFileName()) == 0) {
|
| SrpcParams dummy_params2;
|
| if (!PnaclSrpcLib::InvokeSrpcMethod(browser_interface,
|
| ld_subprocess,
|
|
|