Index: build_tools/install_gtest/nacl-gmock-1.5.0.patch |
=================================================================== |
--- build_tools/install_gtest/nacl-gmock-1.5.0.patch (revision 760) |
+++ build_tools/install_gtest/nacl-gmock-1.5.0.patch (working copy) |
@@ -1,7 +1,7 @@ |
diff -Naur gmock-1.5.0/Makefile gmock-1.5.0.nacl/Makefile |
--- gmock-1.5.0/Makefile 1969-12-31 17:00:00.000000000 -0700 |
+++ gmock-1.5.0.nacl/Makefile 2010-07-07 14:28:27.000000000 -0600 |
-@@ -0,0 +1,25 @@ |
+@@ -0,0 +1,29 @@ |
+CXXFLAGS = -O0 -g |
+INCLUDE = -Iinclude \ |
+ -I. \ |
@@ -13,6 +13,10 @@ |
+OBJ_FILES = gmock-all.o \ |
+ gmock_main.o |
+ |
++# Necessary because we can't CD to the obj directory on windows. |
++OBJ_LIST = $(OBJ_DIR)/gmock-all.o \ |
++ $(OBJ_DIR)/gmock_main.o |
++ |
+all: $(LIB_GMOCK) |
+ @echo "Making libgmock" |
+ |
@@ -26,4 +30,4 @@ |
+ $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@ |
+ |
+$(LIB_GMOCK): $(OBJ_DIR) $(OBJ_FILES) |
-+ cd $(OBJ_DIR) && $(AR) rcs ../$(LIB_GMOCK) $(OBJ_FILES) |
++ $(AR) rcs $(LIB_GMOCK) $(OBJ_LIST) |