From 69f7ecb4dacaa0983126ca1e24f465afd0531e63 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <adeelbm@outlook.com>
Date: Thu, 18 Apr 2019 04:02:55 +0100
Subject: [PATCH] Improve System.Native build experience for new platforms
 (dotnet/corefx#36926)

Commit migrated from https://github.com/dotnet/corefx/commit/65f07a9cf6e3d53cbd77c52d5ecffe00be0ff804
---
 eng/pipelines/libraries/linux.yml                                 | 4 ++--
 .../Unix/System.Security.Cryptography.Native/CMakeLists.txt       | 6 +++++-
 src/libraries/Native/build-native.proj                            | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/eng/pipelines/libraries/linux.yml b/eng/pipelines/libraries/linux.yml
index 3840557..2b623af 100644
--- a/eng/pipelines/libraries/linux.yml
+++ b/eng/pipelines/libraries/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/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt
index cf89756..0560019 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt
+++ b/src/libraries/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/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj
index 0edf486..507ec18 100644
--- a/src/libraries/Native/build-native.proj
+++ b/src/libraries/Native/build-native.proj
@@ -24,12 +24,12 @@
       <_PortableBuildArg Condition="'$(PortableBuild)' == 'true'"> -portable</_PortableBuildArg>
 
       <!--
-        BuildNativeClang is a pass-through argument, to pass an argument to build-native.sh. It is intended to be
-        used to force a specific clang toolset.
+        BuildNativeCompiler is a pass-through argument, to pass an argument to build-native.sh. It is intended to be
+        used to force a specific compiler toolset.
       -->
-      <_BuildNativeClangArg Condition="'$(BuildNativeClang)' != ''"> $(BuildNativeClang)</_BuildNativeClangArg>
+      <_BuildNativeCompilerArg Condition="'$(BuildNativeCompiler)' != ''"> $(BuildNativeCompiler)</_BuildNativeCompilerArg>
 
-      <_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessCountArg)$(_StripSymbolsArg)$(_PortableBuildArg)$(_BuildNativeClangArg)</_BuildNativeUnixArgs>
+      <_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessCountArg)$(_StripSymbolsArg)$(_PortableBuildArg)$(_BuildNativeCompilerArg)</_BuildNativeUnixArgs>
     </PropertyGroup>
 
     <Message Text="$(MSBuildProjectDirectory)/build-native.sh $(_BuildNativeUnixArgs)" Importance="High"/>
-- 
2.7.4