From 59cf17a06b3042f5c15939595e5ca94324994040 Mon Sep 17 00:00:00 2001
From: kai <kai@redstar.de>
Date: Sun, 16 Sep 2012 14:35:33 +0200
Subject: [PATCH] Rename variables for options ms-link and ms-lib.

This prevents a name clash and fixes #164.
---
 gen/programs.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gen/programs.cpp b/gen/programs.cpp
index 0e8e8e24..a3fb6a82 100644
--- a/gen/programs.cpp
+++ b/gen/programs.cpp
@@ -18,12 +18,12 @@ static cl::opt<std::string> ar("ar",
     cl::Hidden,
     cl::ZeroOrMore);
 
-static cl::opt<std::string> link("ms-link",
+static cl::opt<std::string> mslink("ms-link",
     cl::desc("LINK to use for linking on Windows"),
     cl::Hidden,
     cl::ZeroOrMore);
 
-static cl::opt<std::string> lib("ms-lib",
+static cl::opt<std::string> mslib("ms-lib",
     cl::desc("Library Manager to use on Windows"),
     cl::Hidden,
     cl::ZeroOrMore);
@@ -65,10 +65,10 @@ sys::Path getArchiver()
 
 sys::Path getLink()
 {
-    return getProgram("link.exe", link);
+    return getProgram("link.exe", mslink);
 }
 
 sys::Path getLib()
 {
-    return getProgram("lib.exe", lib);
+    return getProgram("lib.exe", mslib);
 }