This commit is contained in:
lperron@google.com
2011-04-06 16:29:51 +00:00
parent 728bbaabee
commit 9245562d88
2 changed files with 1 additions and 4 deletions

View File

@@ -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

View File

@@ -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.