diff --git a/eng/pipelines/linux.yml b/eng/pipelines/linux.yml index 3840557c9bdc..2b623afeb34c 100644 --- a/eng/pipelines/linux.yml +++ b/eng/pipelines/linux.yml @@ -93,7 +93,7 @@ jobs: _helixQueues: $(alpineArm64Queues) _dockerContainer: alpine_37_arm64_container _buildScriptPrefix: 'ROOTFS_DIR=/crossrootfs/arm64 ' - _buildExtraArguments: -warnAsError false /p:BuildNativeClang=--clang5.0 /p:RuntimeOS=linux-musl + _buildExtraArguments: -warnAsError false /p:BuildNativeCompiler=--clang5.0 /p:RuntimeOS=linux-musl pool: name: Hosted Ubuntu 1604 @@ -142,7 +142,7 @@ jobs: _framework: netcoreapp _dockerContainer: alpine_37_arm64_container _buildScriptPrefix: 'ROOTFS_DIR=/crossrootfs/arm64 ' - _buildExtraArguments: -warnAsError false /p:BuildNativeClang=--clang5.0 /p:RuntimeOS=linux-musl + _buildExtraArguments: -warnAsError false /p:BuildNativeCompiler=--clang5.0 /p:RuntimeOS=linux-musl pool: name: Hosted Ubuntu 1604 diff --git a/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt b/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt index cf897562f5a3..056001927f1b 100644 --- a/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt +++ b/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt @@ -14,7 +14,11 @@ if(CMAKE_STATIC_LIB_LINK) set(CMAKE_FIND_LIBRARY_SUFFIXES .a) endif(CMAKE_STATIC_LIB_LINK) -find_package(OpenSSL REQUIRED) +find_package(OpenSSL) +if(NOT OPENSSL_FOUND) + message(FATAL_ERROR "!!! Cannot find libssl and System.Security.Cryptography.Native cannot build without it. Try installing libssl-dev (or the appropriate package for your platform) !!!") +endif(NOT OPENSSL_FOUND) + include_directories(${OPENSSL_INCLUDE_DIR}) set(NATIVECRYPTO_SOURCES diff --git a/src/Native/build-native.proj b/src/Native/build-native.proj index 0edf486adf52..507ec1861aee 100644 --- a/src/Native/build-native.proj +++ b/src/Native/build-native.proj @@ -24,12 +24,12 @@ <_PortableBuildArg Condition="'$(PortableBuild)' == 'true'"> -portable - <_BuildNativeClangArg Condition="'$(BuildNativeClang)' != ''"> $(BuildNativeClang) + <_BuildNativeCompilerArg Condition="'$(BuildNativeCompiler)' != ''"> $(BuildNativeCompiler) - <_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessCountArg)$(_StripSymbolsArg)$(_PortableBuildArg)$(_BuildNativeClangArg) + <_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessCountArg)$(_StripSymbolsArg)$(_PortableBuildArg)$(_BuildNativeCompilerArg)