From 9245562d883ddad1f3941cf6862145fe1a5bcc3d Mon Sep 17 00:00:00 2001
From: "lperron@google.com"
 <lperron@google.com@59fed7e4-672f-1a80-1451-5ac2ff6d83f1>
Date: Wed, 6 Apr 2011 16:29:51 +0000
Subject: [PATCH] fix

---
 Makefile           | 3 ---
 Makefile.build.cpp | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d0a207bb22..1b09c96cdc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,11 @@
 # Let's discover something about where we run
 ifeq "$(SHELL)" "cmd.exe"
 SYSTEM=win
-OS=windows
 else
 ifeq "$(SHELL)" "sh.exe"
 SYSTEM=win
-OS=windows
 else
 SYSTEM=unix
-OS=$(shell uname -s)
 endif
 endif
 
diff --git a/Makefile.build.cpp b/Makefile.build.cpp
index 598379b3ff..638b5c428e 100644
--- a/Makefile.build.cpp
+++ b/Makefile.build.cpp
@@ -219,7 +219,7 @@ gen/linear_solver/linear_solver.pb.cc:linear_solver/linear_solver.proto
 gen/linear_solver/linear_solver.pb.h:gen/linear_solver/linear_solver.pb.cc
 
 $(LIBPREFIX)linear_solver.$(LIBSUFFIX): $(LINEAR_SOLVER_LIB_OS)
-	$(LINKCMD) $(LINKPREFIX)linear_solver.$(LIBSUFFIX) $(LINEAR_SOLVER_LIB_OS)
+	$(LINKCMD) $(LINKPREFIX)$(LIBPREFIX)linear_solver.$(LIBSUFFIX) $(LINEAR_SOLVER_LIB_OS)
 
 # Util library.