Imported Upstream version 5.18.0.234

Former-commit-id: 8071ec1a8c5eaa9be24b41745add19297608001f

external/boringssl/CMakeLists.txt

@@ -15,10 +15,14 @@ enable_language(CXX)
 if(ANDROID)
   # Android-NDK CMake files reconfigure the path and so Go and Perl won't be
   # found. However, ninja will still find them in $PATH if we just name them.
-  set(PERL_EXECUTABLE "perl")
+  if(NOT OPENSSL_NO_ASM)
+    set(PERL_EXECUTABLE "perl")
+  endif()
   # set(GO_EXECUTABLE "go")
 else()
-  find_package(Perl REQUIRED)
+  if(NOT OPENSSL_NO_ASM)
+    find_package(Perl REQUIRED)
+  endif()
   # find_program(GO_EXECUTABLE go)
 endif()
 
@@ -82,6 +86,8 @@ elseif(MSVC)
               # (performance warning)
       "C4820" # 'bytes' bytes padding added after construct 'member_name'
       "C5027" # move assignment operator was implicitly defined as deleted
+      "C5045" # compiler will insert Spectre mitigation for memory load
+              # if /Qspectre switch specified
       )
   set(MSVC_LEVEL4_WARNINGS_LIST
       # See https://connect.microsoft.com/VisualStudio/feedback/details/1217660/warning-c4265-when-using-functional-header
@@ -185,7 +191,9 @@ if (ANDROID AND ${ARCH} STREQUAL "arm")
   # The Android-NDK CMake files somehow fail to set the -march flag for
   # assembly files. Without this flag, the compiler believes that it's
   # building for ARMv5.
-  set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=${CMAKE_SYSTEM_PROCESSOR}")
+  if (NOT OPENSSL_NO_ASM)
+    set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=${CMAKE_SYSTEM_PROCESSOR}")
+  endif()
 endif()
 
 # if (${ARCH} STREQUAL "x86" AND APPLE)