diff options
| author | Jamie Kydd <jamie.b.kydd@gmail.com> | 2020-08-01 05:46:26 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 10:46:26 -0700 |
| commit | a17543d8407cee324ae39dc5bf7504bd5a461c87 (patch) | |
| tree | 31b170ae2827b5f8bfc4c800ab2132fa2fed6b75 /scripts/toolchains/android.cmake | |
| parent | e29945735164d0a2595be24cd897a84b64160553 (diff) | |
| download | vcpkg-a17543d8407cee324ae39dc5bf7504bd5a461c87.tar.gz vcpkg-a17543d8407cee324ae39dc5bf7504bd5a461c87.zip | |
Fix android toolchain so it correctly adds -fPIC flag (#12097)
(cherry picked from commit 497fe8ab805bcafd2cb2abd538db8783f897f9ad)
Diffstat (limited to 'scripts/toolchains/android.cmake')
| -rw-r--r-- | scripts/toolchains/android.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/toolchains/android.cmake b/scripts/toolchains/android.cmake index 8ffe9fbbc..8d2c9f931 100644 --- a/scripts/toolchains/android.cmake +++ b/scripts/toolchains/android.cmake @@ -39,14 +39,14 @@ if(NOT _VCPKG_ANDROID_TOOLCHAIN) set(_VCPKG_ANDROID_TOOLCHAIN 1)
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
if(NOT _CMAKE_IN_TRY_COMPILE)
- string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ")
- string(APPEND CMAKE_CXX_FLAGS_INIT " -fPIC ${VCPKG_CXX_FLAGS} ")
- string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " ${VCPKG_C_FLAGS_DEBUG} ")
- string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " ${VCPKG_CXX_FLAGS_DEBUG} ")
- string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " ${VCPKG_C_FLAGS_RELEASE} ")
- string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " ${VCPKG_CXX_FLAGS_RELEASE} ")
-
- string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
- string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${VCPKG_LINKER_FLAGS} ")
+ string(APPEND CMAKE_C_FLAGS " -fPIC ${VCPKG_C_FLAGS} ")
+ string(APPEND CMAKE_CXX_FLAGS " -fPIC ${VCPKG_CXX_FLAGS} ")
+ string(APPEND CMAKE_C_FLAGS_DEBUG " ${VCPKG_C_FLAGS_DEBUG} ")
+ string(APPEND CMAKE_CXX_FLAGS_DEBUG " ${VCPKG_CXX_FLAGS_DEBUG} ")
+ string(APPEND CMAKE_C_FLAGS_RELEASE " ${VCPKG_C_FLAGS_RELEASE} ")
+ string(APPEND CMAKE_CXX_FLAGS_RELEASE " ${VCPKG_CXX_FLAGS_RELEASE} ")
+
+ string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
+ string(APPEND CMAKE_EXE_LINKER_FLAGS " ${VCPKG_LINKER_FLAGS} ")
endif()
endif()
|