diff options
| author | Chad Versace <[email protected]> | 2018-07-24 17:41:44 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2018-07-27 11:35:56 -0700 |
| commit | 7953399e599862769bc29f5f98322adbcf6c3951 (patch) | |
| tree | d92032d1cf6c0fa041264ae3237bc0286b09ee58 | |
| parent | a5889d70f2074201ceaeac4f96a9a0c0b1f68a31 (diff) | |
gallium/auxiliary: Fix Autotools on Android (v2)
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 <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Tomasz Figa <[email protected]>
Cc: Eric Engestrom <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
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 += \ |