add support for Darwin/macOS in the CMake files; it's not perfect since a lot is still hard-coded for Linux but at least it works

Author: s-u

CMakeLists.txt

@@ -49,6 +49,17 @@ if( ${TARGET_OS} STREQUAL "Linux" )
     message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
     return()
   endif()
+elseif( ${TARGET_OS} STREQUAL "Darwin" )
+  set(OS "OSX")
+  set(OSNAME "Darwin")
+  if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
+    set(ARCHNAME x86-64)
+    set(ARCH X86)
+    set(WRDSZ 64)
+  else()
+    message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
+    return()
+  endif()
 else()
   message("Unsupported OS: ${TARGET_OS}" )
   return()

runtime/CMakeLists.txt

@@ -16,13 +16,24 @@
 
 set (RUNTIME_SHARED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/shared)
 
+if( ${TARGET_OS} STREQUAL "Darwin" )
+  add_definitions(
+   -DTARGET_OSX
+   -DTARGET_OSX_X8664
+   -DOSX86
+  )
+else()
+  add_definitions(
+   -DTARGET_LINUX
+   -DLINUX
+  )
+endif()
+
 add_definitions(
  -DMAXCPUS=256 
  -DMAXCPUSL=8 
  -DMAXCPUSR=8 
- -DTARGET_LINUX 
  -DTARGET_LLVM 
- -DLINUX 
  -DPGF90 
  -DPGFLANG
  -DNATIVE_FPCVT

runtime/flang/CMakeLists.txt

@@ -477,9 +477,16 @@ add_flang_library(flang_shared
   ${SHARED_SOURCES}
   )
 set_property(TARGET flang_shared PROPERTY OUTPUT_NAME flang)
-target_link_libraries(flang_shared ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libflangrti.so)
-# Resolve symbols against libm and librt
-target_link_libraries(flang_shared m rt)
+
+
+if( ${TARGET_OS} STREQUAL "Darwin" )
+  target_link_libraries(flang_shared ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libflangrti.dylib)
+  target_link_libraries(flang_shared m pgmath omp)
+else()
+  target_link_libraries(flang_shared ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libflangrti.so)
+  # Resolve symbols against libm and librt
+  target_link_libraries(flang_shared m rt)
+endif()
 
 set(SHARED_LIBRARY FALSE)
 

tools/flang2/CMakeLists.txt

@@ -33,7 +33,8 @@ set(FLANG2_INCLUDE_DIR    ${CMAKE_CURRENT_BINARY_DIR}/include)
 
 include_directories(${FLANG2_INCLUDE_DIR})
 
-if( ${TARGET_OS} STREQUAL "Linux" )
+# this is a hack until there is a proper setup
+if( ${TARGET_OS} STREQUAL "Linux|Darwin" )
   if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
     set(X86_64 ON)
     set(LINUX86 ON)