Skip to content

Commit 4006273

Browse files
authored
Remove Android-specific detection of GLM_HAS_CXX11_STL
Android NDK starting from r18 has libcxx, and it's the only STL available. (reference: https://developer.android.com/ndk/guides/cpp-support#cs) r18 is ~6 years old at this point. This check dates to ~8 years ago (predating r18) and was important at that time. Right now, it can be clearly stated that given the C++11 requirement stated in README for GLM, as well as (unless you are building with very outdated toolchain) - all modern Android is built with NDK toolchain that is newer than r18 - this check can be removed, and all the functionality can by default delegate to general detection for STL compatibility.
1 parent 33b4a62 commit 4006273

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

glm/detail/setup.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,7 @@
148148
// http://gcc.gnu.org/projects/cxx0x.html
149149
// http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
150150

151-
// Android has multiple STLs but C++11 STL detection doesn't always work #284 #564
152-
#if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
153-
# define GLM_HAS_CXX11_STL 0
154-
#elif (GLM_COMPILER & GLM_COMPILER_CUDA_RTC) == GLM_COMPILER_CUDA_RTC
151+
#if (GLM_COMPILER & GLM_COMPILER_CUDA_RTC) == GLM_COMPILER_CUDA_RTC
155152
# define GLM_HAS_CXX11_STL 0
156153
#elif (GLM_COMPILER & GLM_COMPILER_HIP)
157154
# define GLM_HAS_CXX11_STL 0

0 commit comments

Comments
 (0)