Merge pull request #95 from isuruf/abi

Don't check fortran ABI

Author: isuruf

.appveyor.yml

@@ -20,7 +20,7 @@ install:
   # Add our channels.
   - cmd: conda config --add channels defaults
   - cmd: conda config --add channels conda-forge
-  - cmd: conda install --yes --quiet llvmdev clangdev flang cmake
+  - cmd: conda install --yes --quiet llvmdev clangdev flang-meta cmake
   - cmd: conda install --yes -c isuruf kitware-ninja
 
 

.travis.yml

@@ -30,12 +30,9 @@ install:
 script:
   - mkdir -p build
   - cd build
-  - cmake -DFLANG_INCLUDE_TESTS=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_Fortran_COMPILER=flang ..
+  - cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DFLANG_INCLUDE_TESTS=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_Fortran_COMPILER=flang ..
   - make -j4
-  
-  - cp lib/* $HOME/miniconda/envs/test-environment/lib
-  - cp bin/* $HOME/miniconda/envs/test-environment/bin
-  
+  - make install -j4  
   - make check-flang
 
 notifications:

CMakeLists.txt

@@ -21,9 +21,9 @@ cmake_minimum_required(VERSION 2.8)
 # In order to bootstrap the runtime library we need to skip
 # CMake's Fortran tests
 SET(CMAKE_Fortran_COMPILER_WORKS 1)
-
-
-set(CMAKE_Fortran_PREPROCESS_SOURCE
+SET(CMAKE_Fortran_ABI_COMPILED 0)
+SET(CMAKE_Fortran_COMPILER_SUPPORTS_F90 1)
+SET(CMAKE_Fortran_PREPROCESS_SOURCE
     "<CMAKE_Fortran_COMPILER> -cpp <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> -o <PREPROCESSED_SOURCE>")
 
 # If we are not building as a part of LLVM, build Flang as an
@@ -359,25 +359,14 @@ include_directories(BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   )
 
-if (MSVC)
 # Direct module files to build include directory
 set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/runtime/flang)
 
 # Install Fortran module files
-# TODO: this creates empty directories. Figure out a workaround or
-# better would be to figure out why CMAKE_Fortran_MODULE_DIRECTORY is different
-install(DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/
-  DESTINATION include FILES_MATCHING PATTERN *.mod
-  )
-else()
-# Direct module files to build include directory
-set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include)
-
-# Install Fortran module files
-install(DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/
-  DESTINATION include
-  )
-endif()
+install(
+    CODE "file(GLOB FLANG_MOD_FILES \"${CMAKE_Fortran_MODULE_DIRECTORY}/*.mod\")"
+    CODE "file(INSTALL \${FLANG_MOD_FILES} DESTINATION \"${CMAKE_INSTALL_PREFIX}/include\")"
+)
 
 # Install Fortran OpenMP include file
 # Copy omp_lib.h file, not the symlink

runtime/flang/CMakeLists.txt

@@ -477,11 +477,11 @@ SET(FTN_SUPPORT
   xfer_rpm1.c
   )
 
-add_library(iso_c_bind
+add_library(iso_c_bind OBJECT
   iso_c_bind.F95
 )
 
-add_library(ieee_arithmetic
+add_library(ieee_arithmetic OBJECT
   ieee_arithmetic.F95
   ieee_exceptions.F95
 )

runtime/flangrti/CMakeLists.txt

@@ -201,7 +201,7 @@ add_flang_library(flangrti_shared
 # Resolve symbols against libm
 
 if (NOT MSVC)
-target_link_libraries(flangrti_shared  m)
+target_link_libraries(flangrti_shared PUBLIC m)
 endif()
 
 # Import OpenMP