Merge topic 'target-system-variables'

e4c53cdc15 BinUtils: Drop now-unnecessary cross-compiling workaround for Apple hosts
1373373823 enable_language: Establish target platform identification variables earlier
1d916bf3d2 kFreeBSD,GNU: Provide multiarch library directory regex earlier

Acked-by: Kitware Robot <[email protected]>
Tested-by: buildbot <[email protected]>
Reviewed-by: Ben Boeckel <[email protected]>
Merge-request: !8544

Modules/CMakeFindBinUtils.cmake

@@ -179,25 +179,15 @@ else()
     elseif(NOT APPLE)
       list(PREPEND _CMAKE_LINKER_NAMES "ld.lld")
     endif()
-    if(APPLE)
-      # llvm-ar does not generate a symbol table that the Apple ld64 linker accepts.
-      # FIXME(#23333): We still need to consider 'llvm-ar' as a fallback because
-      # the 'APPLE' definition may be based on the host in this context, and a
-      # cross-compiling toolchain may not have 'ar'.
-      list(APPEND _CMAKE_AR_NAMES "llvm-ar")
-    else()
+    # llvm-ar does not generate a symbol table that the Apple ld64 linker accepts.
+    if(NOT APPLE)
       list(PREPEND _CMAKE_AR_NAMES "llvm-ar")
     endif()
     list(PREPEND _CMAKE_RANLIB_NAMES "llvm-ranlib")
+    # llvm-strip versions prior to 11 require additional flags we do not yet add.
     if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}" VERSION_GREATER_EQUAL 11)
-      # llvm-strip versions prior to 11 require additional flags we do not yet add.
-      if(APPLE)
-        # llvm-strip does not seem to support chained fixup format correctly.
-        # FIXME(#23333): We still need to consider 'llvm-strip' as a fallback
-        # because the 'APPLE' definition may be based on the host in this context,
-        # and a cross-compiling toolchain may not have 'strip'.
-        list(APPEND _CMAKE_STRIP_NAMES "llvm-strip")
-      else()
+      # llvm-strip does not seem to support chained fixup format on macOS correctly.
+      if(NOT APPLE)
         list(PREPEND _CMAKE_STRIP_NAMES "llvm-strip")
       endif()
     endif()

Modules/CMakeSystemSpecificInformation.cmake

@@ -6,19 +6,6 @@
 # It is included after the compiler has been determined, so
 # we know things like the compiler name and if the compiler is gnu.
 
-# before cmake 2.6 these variables were set in cmMakefile.cxx. This is still
-# done to keep scripts and custom language and compiler modules working.
-# But they are reset here and set again in the platform files for the target
-# platform, so they can be used for testing the target platform instead
-# of testing the host platform.
-set(APPLE  )
-set(UNIX   )
-set(CYGWIN )
-set(MSYS )
-set(WIN32  )
-set(BSD )
-set(LINUX )
-
 function(_cmake_record_install_prefix )
   set(_CMAKE_SYSTEM_PREFIX_PATH_INSTALL_PREFIX_VALUE "${CMAKE_INSTALL_PREFIX}" PARENT_SCOPE)
   set(_CMAKE_SYSTEM_PREFIX_PATH_STAGING_PREFIX_VALUE "${CMAKE_STAGING_PREFIX}" PARENT_SCOPE)

Modules/CMakeSystemSpecificInitialize.cmake

@@ -5,6 +5,19 @@
 # This file is included by cmGlobalGenerator::EnableLanguage.
 # It is included before the compiler has been determined.
 
+# before cmake 2.6 these variables were set in cmMakefile.cxx. This is still
+# done to keep scripts and custom language and compiler modules working.
+# But they are reset here and set again in the platform files for the target
+# platform, so they can be used for testing the target platform instead
+# of testing the host platform.
+unset(APPLE)
+unset(UNIX)
+unset(CYGWIN)
+unset(MSYS)
+unset(WIN32)
+unset(BSD)
+unset(LINUX)
+
 # The CMAKE_EFFECTIVE_SYSTEM_NAME is used to load compiler and compiler
 # wrapper configuration files. By default it equals to CMAKE_SYSTEM_NAME
 # but could be overridden in the ${CMAKE_SYSTEM_NAME}-Initialize files.

Modules/Platform/AIX-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/Android-Initialize.cmake

@@ -23,6 +23,11 @@ if(CMAKE_SYSTEM_VERSION EQUAL 1)
   return()
 endif()
 
+include(Platform/Linux-Initialize)
+unset(LINUX)
+
+set(ANDROID 1)
+
 set(CMAKE_BUILD_TYPE_INIT "RelWithDebInfo")
 
 if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED)

Modules/Platform/Android.cmake

@@ -4,11 +4,6 @@ if(CMAKE_ANDROID_NDK)
   include(${CMAKE_ANDROID_NDK}/build/cmake/hooks/pre/Android.cmake OPTIONAL)
 endif()
 
-include(Platform/Linux)
-unset(LINUX)
-
-set(ANDROID 1)
-
 # Natively compiling on an Android host doesn't need these flags to be reset.
 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android")
   return()

Modules/Platform/BSDOS-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/BeOS-Initialize.cmake

@@ -0,0 +1,2 @@
+set(BEOS 1)
+set(UNIX 1)

Modules/Platform/BeOS.cmake

@@ -1,5 +1,3 @@
-set(BEOS 1)
-
 set(CMAKE_DL_LIBS root be)
 set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
 set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")

Modules/Platform/BlueGeneL-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/BlueGeneP-base.cmake

@@ -49,11 +49,6 @@ set(CMAKE_SYSTEM_IGNORE_PATH
   /usr/X11R7/lib   /usr/X11R7/lib64   /usr/X11R7/include
 )
 
-#
-# Indicate that this is a unix-like system
-#
-set(UNIX 1)
-
 #
 # Library prefixes, suffixes, extra libs.
 #

Modules/Platform/BlueGeneP-dynamic-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/BlueGeneP-static-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/BlueGeneQ-base.cmake

@@ -39,11 +39,6 @@ set(CMAKE_SYSTEM_IGNORE_PATH
   /usr/X11R7/lib   /usr/X11R7/lib64   /usr/X11R7/include
 )
 
-#
-# Indicate that this is a unix-like system
-#
-set(UNIX 1)
-
 #
 # Library prefixes, suffixes, extra libs.
 #

Modules/Platform/BlueGeneQ-dynamic-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/BlueGeneQ-static-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/CYGWIN-Initialize.cmake

@@ -0,0 +1,2 @@
+set(CYGWIN 1)
+set(UNIX 1)

Modules/Platform/CYGWIN.cmake

@@ -1,5 +1,3 @@
-set(CYGWIN 1)
-
 set(CMAKE_SHARED_LIBRARY_PREFIX "cyg")
 set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll")
 set(CMAKE_SHARED_MODULE_PREFIX "cyg")

Modules/Platform/Catamount-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/CrayLinuxEnvironment-Initialize.cmake

@@ -0,0 +1,4 @@
+# CrayLinuxEnvironment: loaded by users cross-compiling on a Cray front-end
+# node by specifying "-DCMAKE_SYSTEM_NAME=CrayLinuxEnvironment" to cmake
+
+set(UNIX 1)

Modules/Platform/CrayLinuxEnvironment.cmake

@@ -1,8 +1,6 @@
 # CrayLinuxEnvironment: loaded by users cross-compiling on a Cray front-end
 # node by specifying "-DCMAKE_SYSTEM_NAME=CrayLinuxEnvironment" to cmake
 
-set(UNIX 1)
-
 if(DEFINED ENV{CRAYOS_VERSION})
   set(CMAKE_SYSTEM_VERSION "$ENV{CRAYOS_VERSION}")
 elseif(DEFINED ENV{XTOS_VERSION})

Modules/Platform/DOS-Initialize.cmake

@@ -0,0 +1 @@
+set(DOS 1)

Modules/Platform/DOS.cmake

@@ -1,5 +1,3 @@
-set(DOS 1)
-
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
 set(CMAKE_SHARED_LIBRARY_PREFIX "")

Modules/Platform/Darwin-Initialize.cmake

@@ -1,3 +1,6 @@
+set(APPLE 1)
+set(UNIX 1)
+
 # Ask xcode-select where to find /Developer or fall back to ancient location.
 execute_process(COMMAND xcode-select -print-path
   OUTPUT_VARIABLE _stdout

Modules/Platform/Darwin.cmake

@@ -1,5 +1,3 @@
-set(APPLE 1)
-
 if(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "tvOS" OR CMAKE_SYSTEM_NAME STREQUAL "watchOS")
   if(NOT DEFINED CMAKE_MACOSX_BUNDLE)
     set(CMAKE_MACOSX_BUNDLE ON)

Modules/Platform/DragonFly-Initialize.cmake

@@ -0,0 +1,2 @@
+include(Platform/FreeBSD-Initialize)
+set(BSD "DragonFlyBSD")

Modules/Platform/DragonFly.cmake

@@ -3,7 +3,6 @@
 # see http://archive.netbsd.se/?ml=dfbsd-users&a=2007-07&m=4678361
 
 include(Platform/FreeBSD)
-set(BSD "DragonFlyBSD")
 
 # DragonFly BSD requires -z origin to enable $ORIGIN expansion in RPATH.
 # This is not required for FreeBSD since 10.2-RELEASE.

Modules/Platform/FreeBSD-Initialize.cmake

@@ -0,0 +1,2 @@
+set(BSD "FreeBSD")
+set(UNIX 1)

Modules/Platform/FreeBSD.cmake

@@ -1,4 +1,3 @@
-set(BSD "FreeBSD")
 set(CMAKE_DL_LIBS "")
 set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
 set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")

Modules/Platform/Fuchsia-Initialize.cmake

@@ -0,0 +1 @@
+set(FUCHSIA 1)

Modules/Platform/Fuchsia.cmake

@@ -1,5 +1,3 @@
-set(FUCHSIA 1)
-
 set(CMAKE_DL_LIBS "")
 set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
 set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")

Modules/Platform/GNU-Initialize.cmake

@@ -0,0 +1,3 @@
+set(UNIX 1)
+
+set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*")

Modules/Platform/GNU.cmake

@@ -35,6 +35,4 @@ else()
   endif()
 endif()
 
-set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*")
-
 include(Platform/UnixPaths)

Modules/Platform/HP-UX-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/Haiku-Initialize.cmake

@@ -0,0 +1,2 @@
+set(HAIKU 1)
+set(UNIX 1)

Modules/Platform/Haiku.cmake

@@ -1,6 +1,3 @@
-set(HAIKU 1)
-set(UNIX 1)
-
 set(CMAKE_DL_LIBS "")
 set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
 set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")

Modules/Platform/Linux-Initialize.cmake

@@ -1,2 +1,5 @@
+set(LINUX 1)
+set(UNIX 1)
+
 # Match multiarch library directory names.
 set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")

Modules/Platform/Linux.cmake

@@ -1,4 +1,3 @@
-set(LINUX 1)
 set(CMAKE_DL_LIBS "dl")
 set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
 set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")

Modules/Platform/MP-RAS-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/MSYS-Initialize.cmake

@@ -0,0 +1,2 @@
+set(MSYS 1)
+include(Platform/CYGWIN-Initialize)

Modules/Platform/MSYS.cmake

@@ -1,4 +1,3 @@
-set(MSYS 1)
 include(Platform/CYGWIN)
 set(CMAKE_SHARED_LIBRARY_PREFIX "msys-")
 set(CMAKE_SHARED_MODULE_PREFIX "msys-")

Modules/Platform/Midipix-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/NetBSD-Initialize.cmake

@@ -0,0 +1,2 @@
+set(BSD "NetBSD")
+set(UNIX 1)

Modules/Platform/NetBSD.cmake

@@ -1,4 +1,3 @@
-set(BSD "NetBSD")
 set(CMAKE_DL_LIBS "")
 set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
 set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")

Modules/Platform/OSF1-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/OpenBSD-Initialize.cmake

@@ -0,0 +1,2 @@
+include(Platform/NetBSD-Initialize)
+set(BSD "OpenBSD")

Modules/Platform/OpenBSD.cmake

@@ -1,5 +1,4 @@
 include(Platform/NetBSD)
-set(BSD "OpenBSD")
 
 # On OpenBSD, the compile time linker does not share it's configuration with
 # the runtime linker.  This will extract the library search paths from the

Modules/Platform/OpenVMS-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/QNX-Initialize.cmake

@@ -0,0 +1,3 @@
+set(QNXNTO 1)
+include(Platform/GNU-Initialize)
+unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)

Modules/Platform/QNX.cmake

@@ -1,7 +1,4 @@
-set(QNXNTO 1)
-
 include(Platform/GNU)
-unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
 
 set(CMAKE_DL_LIBS "")
 

Modules/Platform/RISCos-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/SCO_SV-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/SINIX-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/SerenityOS-Initialize.cmake

@@ -0,0 +1,2 @@
+set(SERENITYOS 1)
+set(UNIX 1)

Modules/Platform/SerenityOS.cmake

@@ -1,6 +1,3 @@
-
-set(SERENITYOS 1)
-
 set(CMAKE_DL_LIBS "")
 set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
 set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")

Modules/Platform/SunOS-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/Tru64-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/ULTRIX-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/UNIX_SV-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/UnixPaths.cmake

@@ -12,6 +12,9 @@ if(__UNIX_PATHS_INCLUDED)
 endif()
 set(__UNIX_PATHS_INCLUDED 1)
 
+# Since CMake 3.27, the Platform/<os>-Initialize modules set UNIX
+# if the corresponding Platform/<os> modules includes UnixPaths.
+# Retain the setting here to support externally-maintained platform modules.
 set(UNIX 1)
 
 # also add the install directory of the running cmake to the search directories

Modules/Platform/UnixWare-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/Windows-Initialize.cmake

@@ -0,0 +1 @@
+set(WIN32 1)

Modules/Platform/Windows.cmake

@@ -1,13 +1,3 @@
-set(WIN32 1)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "WindowsCE")
-  set(WINCE 1)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone")
-  set(WINDOWS_PHONE 1)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-  set(WINDOWS_STORE 1)
-endif()
-
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
 set(CMAKE_SHARED_LIBRARY_PREFIX "")          # lib

Modules/Platform/WindowsCE-Initialize.cmake

@@ -0,0 +1,2 @@
+include(Platform/Windows-Initialize)
+set(WINCE 1)

Modules/Platform/WindowsPhone-Initialize.cmake

@@ -0,0 +1,2 @@
+include(Platform/Windows-Initialize)
+set(WINDOWS_PHONE 1)

Modules/Platform/WindowsStore-Initialize.cmake

@@ -0,0 +1,2 @@
+include(Platform/Windows-Initialize)
+set(WINDOWS_STORE 1)

Modules/Platform/Xenix-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/eCos-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)

Modules/Platform/kFreeBSD-Initialize.cmake

@@ -0,0 +1,5 @@
+# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD,
+# and should be marked as LINUX
+include(Platform/Linux-Initialize)
+
+set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*")

Modules/Platform/kFreeBSD.cmake

@@ -1,5 +1,2 @@
-# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD,
-# and should be marked as LINUX
+# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD.
 include(Platform/Linux)
-
-set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*")

Modules/Platform/syllable-Initialize.cmake

@@ -0,0 +1 @@
+set(UNIX 1)