From e44a9c92998a24baf80f75997cbcc651a10e34d2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 5 Aug 2008 09:55:02 -0400 Subject: 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. --- Source/cmLocalGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v0.12