| Index: build_tools/install_gtest/nacl-gtest-1.5.0.patch
|
| ===================================================================
|
| --- build_tools/install_gtest/nacl-gtest-1.5.0.patch (revision 760)
|
| +++ build_tools/install_gtest/nacl-gtest-1.5.0.patch (working copy)
|
| @@ -1,7 +1,7 @@
|
| diff -Naur gtest-1.5.0/Makefile gtest-1.5.0.nacl/Makefile
|
| --- gtest-1.5.0/Makefile 1969-12-31 17:00:00.000000000 -0700
|
| +++ gtest-1.5.0.nacl/Makefile 2010-07-08 09:49:37.000000000 -0600
|
| -@@ -0,0 +1,25 @@
|
| +@@ -0,0 +1,32 @@
|
| +CXXFLAGS = -O0 -g
|
| +INCLUDE = -Iinclude -I.
|
| +LIB_GTEST = libgtest.a
|
| @@ -13,6 +13,13 @@
|
| + gtest-test-part.o \
|
| + gtest-typed-test.o
|
| +
|
| ++# Necessary because we can't CD to the obj directory on windows.
|
| ++OBJ_LIST = $(OBJ_DIR)/gtest.o \
|
| ++ $(OBJ_DIR)/gtest-filepath.o \
|
| ++ $(OBJ_DIR)/gtest-port.o \
|
| ++ $(OBJ_DIR)/gtest-test-part.o \
|
| ++ $(OBJ_DIR)/gtest-typed-test.o
|
| ++
|
| +all: $(LIB_GTEST)
|
| + @echo "Making libgtest"
|
| +
|
| @@ -26,13 +33,13 @@
|
| + $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@
|
| +
|
| +$(LIB_GTEST): $(OBJ_DIR) $(OBJ_FILES)
|
| -+ cd $(OBJ_DIR) && $(AR) rcs ../$(LIB_GTEST) $(OBJ_FILES)
|
| ++ $(AR) rcs $(LIB_GTEST) $(OBJ_LIST)
|
| diff -Naur gtest-1.5.0/include/gtest/gtest.h gtest-1.5.0.nacl/include/gtest/gtest.h
|
| --- gtest-1.5.0/include/gtest/gtest.h 2010-04-15 16:02:03.000000000 -0600
|
| +++ gtest-1.5.0.nacl/include/gtest/gtest.h 2010-07-08 09:49:37.000000000 -0600
|
| @@ -56,7 +56,6 @@
|
| -
|
| - #include <gtest/internal/gtest-internal.h>
|
| + #include <gtest/internal/gtest-internal.h>ls
|
| +
|
| #include <gtest/internal/gtest-string.h>
|
| -#include <gtest/gtest-death-test.h>
|
| #include <gtest/gtest-message.h>
|
|
|