From: Jan Vorlicek Date: Wed, 11 Dec 2019 15:38:52 +0000 (+0100) Subject: Fix Emscripten build of libraries (#762) X-Git-Tag: submit/tizen/20210909.063632~10721 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de12f85a9452c7b10e1e5c0f69c2d959f698ba10;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Fix Emscripten build of libraries (#762) Updating the libraries native build to use native cmake support for the position independent code has broken emscripten build. This change disables that for Emscripten. --- diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt index e2b2063..f4deee6 100644 --- a/src/libraries/Native/Unix/CMakeLists.txt +++ b/src/libraries/Native/Unix/CMakeLists.txt @@ -1,17 +1,19 @@ cmake_minimum_required(VERSION 2.8.12) project(CoreFX C) -cmake_policy(SET CMP0083 NEW) +if(NOT CMAKE_SYSTEM_NAME STREQUAL Emscripten) + cmake_policy(SET CMP0083 NEW) -include(CheckPIESupported) + include(CheckPIESupported) -# All code we build should be compiled as position independent -check_pie_supported(OUTPUT_VARIABLE PIE_SUPPORT_OUTPUT LANGUAGES C) -if(NOT MSVC AND NOT CMAKE_C_LINK_PIE_SUPPORTED) - message(WARNING "PIE is not supported at link time: ${PIE_SUPPORT_OUTPUT}.\n" - "PIE link options will not be passed to linker.") -endif() -set(CMAKE_POSITION_INDEPENDENT_CODE ON) + # All code we build should be compiled as position independent + check_pie_supported(OUTPUT_VARIABLE PIE_SUPPORT_OUTPUT LANGUAGES C) + if(NOT MSVC AND NOT CMAKE_C_LINK_PIE_SUPPORTED) + message(WARNING "PIE is not supported at link time: ${PIE_SUPPORT_OUTPUT}.\n" + "PIE link options will not be passed to linker.") + endif() + set(CMAKE_POSITION_INDEPENDENT_CODE ON) +endif(NOT CMAKE_SYSTEM_NAME STREQUAL Emscripten) set(CMAKE_MACOSX_RPATH ON) set(CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir})