Skip to content

Commit

Permalink
BUILD: Attempt to fix Android builds when building the test runner
Browse files Browse the repository at this point in the history
Android builds currently fail when building the test runner because
the runner tries to include standard library headers, which cannot
be found. This patch adds the gcc-stdlibc++ include directory that
matches the existing gcc-stdlibc++ linker flag.
  • Loading branch information
csnover committed Jan 15, 2017
1 parent 290bd97 commit ee04b63
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions configure
Expand Up @@ -2358,6 +2358,7 @@ case $_host_os in
append_var LDFLAGS "-mthumb-interwork"
fi

append_var CXXFLAGS "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/include/"
append_var LDFLAGS "-L$ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/"
append_var LIBS "-lsupc++"
add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
Expand Down

0 comments on commit ee04b63

Please sign in to comment.