diff options
| author | Brad King <brad.king@kitware.com> | 2008-08-05 13:55:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-08-05 13:55:02 (GMT) |
| commit | e44a9c92998a24baf80f75997cbcc651a10e34d2 (patch) | |
| tree | 9b9a54f863edbdaeb3a9cab1ab3a29d65a686de6 /Source/cmLocalGenerator.cxx | |
| parent | 090b90d727d02889fa91fddd3ccd6feb0a6047d2 (diff) | |
| download | CMake-e44a9c92998a24baf80f75997cbcc651a10e34d2.zip CMake-e44a9c92998a24baf80f75997cbcc651a10e34d2.tar.gz CMake-e44a9c92998a24baf80f75997cbcc651a10e34d2.tar.bz2 | |
BUG: Fix escaping in link scripts
When generating escape sequences for the native build tool do not put in
Makefile escapes for paths generated into link scripts. This fixes
putting "$ORIGIN" into the RPATH, and probably some other subtle
problems.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index dd978fe..d835bc4 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2579,7 +2579,7 @@ std::string cmLocalGenerator::EscapeForShell(const char* str, bool makeVars, { flags |= cmsysSystem_Shell_Flag_VSIDE; } - else + else if(!this->LinkScriptShell) { flags |= cmsysSystem_Shell_Flag_Make; } |