From 7d565f1e7a0f107506d3cf31ef2e33e22a504d2b Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Tue, 4 Feb 2014 15:43:52 -0800
Subject: Sync from Google development.

---
 Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 440d4f2..26a526e 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ endif
 CC=gcc
 CXX=g++
 CFLAGS=-std=gnu99
-CXXFLAGS=-Ibindings/cpp
+CXXFLAGS=-std=c++11
 INCLUDE=-Itests -I.
 CPPFLAGS=$(INCLUDE) -Wall -Wextra -Wno-sign-compare $(USER_CFLAGS)
 LDLIBS=-lpthread upb/libupb.a
@@ -220,10 +220,7 @@ SIMPLE_TESTS= \
 
 SIMPLE_CXX_TESTS= \
   tests/test_cpp \
-
-  # The build process for this test is complicated and hasn't been
-  # ported to the open-source Makefile yet.
-  # tests/test_decoder \
+  tests/pb/test_decoder
 
 VARIADIC_TESTS= \
   tests/t.test_vs_proto2.googlemessage1 \
-- 
cgit v1.2.3