From 7953399e599862769bc29f5f98322adbcf6c3951 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Tue, 24 Jul 2018 17:41:44 -0700 Subject: [PATCH] gallium/auxiliary: Fix Autotools on Android (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Problem 1: u_debug_stack_android.cpp transitively included "pipe/p_compiler.h", but src/gallium/include was missing from the C++ include path. Problem 2: Add -std=c++11 to AM_CXXFLAGS. Android's libbacktrace headers require C++11, but the Android toolchain (at least in the Chrome OS SDK) does not enable C++11 by default. v2: Add -std=c++11. Reviewed-by: Gurchetan Singh Reviewed-by: Marek Olšák Reviewed-by: Tomasz Figa Cc: Eric Engestrom --- src/gallium/auxiliary/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 03908198772..4bfa7648389 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -13,6 +13,7 @@ AM_CFLAGS = \ $(MSVC2013_COMPAT_CFLAGS) AM_CXXFLAGS = \ + $(GALLIUM_CFLAGS) \ $(VISIBILITY_CXXFLAGS) \ $(MSVC2013_COMPAT_CXXFLAGS) @@ -22,6 +23,10 @@ libgallium_la_SOURCES = \ $(GENERATED_SOURCES) if HAVE_PLATFORM_ANDROID +# Android's libbacktrace headers required C++11, but the Android toolchain (at +# least in the Chrome OS SDK) does not enable C++11 by default. +AM_CXXFLAGS += $(CXX11_CXXFLAGS) + libgallium_la_SOURCES += util/u_debug_stack_android.cpp endif @@ -41,7 +46,6 @@ AM_CFLAGS += \ $(LLVM_CFLAGS) AM_CXXFLAGS += \ - $(GALLIUM_CFLAGS) \ $(LLVM_CXXFLAGS) libgallium_la_SOURCES += \ -- 2.30.2