diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt index c9af0c4c7086d..9e0e2656faf7c 100644 --- a/src/libraries/Native/Unix/CMakeLists.txt +++ b/src/libraries/Native/Unix/CMakeLists.txt @@ -10,6 +10,10 @@ project(CoreFX C) include(${CLR_ENG_NATIVE_DIR}/configuretools.cmake) set(CMAKE_MACOSX_RPATH ON) +if(CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS) + set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) + set(CMAKE_INSTALL_NAME_DIR "@rpath") +endif() set(CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh index a727d7ef60d43..2aaa9fe4831f9 100755 --- a/src/libraries/Native/build-native.sh +++ b/src/libraries/Native/build-native.sh @@ -114,13 +114,13 @@ elif [[ "$__TargetOS" == iOS ]]; then # keep in sync with src/mono/Directory.Build.props __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=8.0 -DCMAKE_OSX_ARCHITECTURES=\"i386\" $__CMakeArgs" elif [[ "$__BuildArch" == arm64 ]]; then - # set default iOS device deployment target (7.0 is the minimum supported by Xcode 11) + # set default iOS device deployment target # keep in sync with src/mono/Directory.Build.props - __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=7.0 -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" + __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=8.0 -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" elif [[ "$__BuildArch" == arm ]]; then - # set default iOS device deployment target (7.0 is the minimum supported by Xcode 11) + # set default iOS device deployment target # keep in sync with src/mono/Directory.Build.props - __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=7.0 -DCMAKE_OSX_ARCHITECTURES=\"armv7;armv7s\" $__CMakeArgs" + __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=8.0 -DCMAKE_OSX_ARCHITECTURES=\"armv7;armv7s\" $__CMakeArgs" else echo "Error: Unknown iOS architecture $__BuildArch." exit 1 diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index c6d57bc3caed0..937fd46e3389e 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -51,8 +51,7 @@ - 7.0 - 8.0 + 8.0 9.0 2.0 5.1