fix: 1) strings: a = [a, b] -> add_strings; 2) eval GNU/Clang backend on mac

Author: perazz

src/fpm/manifest/preprocess.f90

@@ -12,7 +12,7 @@
 
 module fpm_manifest_preprocess
    use fpm_error, only : error_t, syntax_error
-   use fpm_strings, only : string_t, operator(==)
+   use fpm_strings, only : string_t, operator(==), add_strings
    use tomlf, only : toml_table, toml_key, toml_stat
    use fpm_toml, only : get_value, get_list, serializable_t, set_value, set_list, &
                         set_string
@@ -326,31 +326,16 @@ subroutine add_config(this,that)
         if (.not.allocated(this%name)) this%name = that%name
 
         ! Add macros
-        if (allocated(that%macros)) then
-            if (allocated(this%macros)) then
-                this%macros = [this%macros, that%macros]
-            else
-                allocate(this%macros, source = that%macros)
-            end if
-        endif
-
+        if (allocated(that%macros)) &
+        call add_strings(this%macros, that%macros)
+            
         ! Add suffixes
-        if (allocated(that%suffixes)) then
-            if (allocated(this%suffixes)) then
-                this%suffixes = [this%suffixes, that%suffixes]
-            else
-                allocate(this%suffixes, source = that%suffixes)
-            end if
-        endif
+        if (allocated(that%suffixes)) &
+        call add_strings(this%suffixes, that%suffixes)
 
         ! Add directories
-        if (allocated(that%directories)) then
-            if (allocated(this%directories)) then
-                this%directories = [this%directories, that%directories]
-            else
-                allocate(this%directories, source = that%directories)
-            end if
-        endif
+        if (allocated(that%directories)) &
+        call add_strings(this%directories, that%directories)
 
     end subroutine add_config
 

src/fpm_compiler.F90

@@ -41,7 +41,7 @@ module fpm_compiler
 use fpm_filesystem, only: join_path, basename, get_temp_filename, delete_file, unix_path, &
     & getline, run
 use fpm_strings, only: split, string_cat, string_t, str_ends_with, str_begins_with_str, &
-    & string_array_contains, lower
+    & string_array_contains, lower, add_strings
 use fpm_error, only: error_t, fatal_error, fpm_stop
 use tomlf, only: toml_table
 use fpm_toml, only: serializable_t, set_string, set_value, toml_stat, get_value
@@ -53,7 +53,7 @@ module fpm_compiler
 public :: append_clean_flags, append_clean_flags_array
 public :: debug
 public :: id_gcc,id_all
-public :: match_compiler_type, compiler_id_name, validate_compiler_name
+public :: match_compiler_type, compiler_id_name, validate_compiler_name, is_cxx_gnu_based
 
 enum, bind(C)
     enumerator :: &
@@ -932,6 +932,43 @@ subroutine get_default_cxx_compiler(f_compiler, cxx_compiler)
 
 end subroutine get_default_cxx_compiler
 
+!> Check if C++ compiler is GNU-based by checking its version output
+function is_cxx_gnu_based(cxx_compiler) result(is_gnu)
+    character(len=*), intent(in) :: cxx_compiler
+    logical :: is_gnu
+    character(len=:), allocatable :: output_file, version_output
+    integer :: stat, io
+
+    is_gnu = .false.
+
+    ! Get temporary file for compiler version output
+    output_file = get_temp_filename()
+
+    ! Run compiler with --version to get version info
+    call run(cxx_compiler//" --version > "//output_file//" 2>&1", &
+             echo=.false., exitstat=stat)
+
+    if (stat == 0) then
+        ! Read the version output
+        open(file=output_file, newunit=io, iostat=stat)
+        if (stat == 0) then
+            call getline(io, version_output, stat)
+            close(io, iostat=stat)
+
+            ! Check if output contains GNU indicators
+            if (allocated(version_output)) then
+                is_gnu = index(version_output, 'gcc') > 0 .or. &
+                         index(version_output, 'GCC') > 0 .or. &
+                         index(version_output, 'GNU') > 0 .or. &
+                         index(version_output, 'Free Software Foundation') > 0
+            end if
+    end if
+
+    ! Clean up temporary file
+    call run("rm -f "//output_file, echo=.false., exitstat=stat)
+
+end function is_cxx_gnu_based
+
 
 function get_compiler_id(compiler) result(id)
     character(len=*), intent(in) :: compiler
@@ -2101,7 +2138,7 @@ subroutine append_clean_flags_array(flags_array, new_flags_array)
         if (trim(new_flags_array(i)%s) == "-I") cycle
         if (trim(new_flags_array(i)%s) == "-J") cycle
         if (trim(new_flags_array(i)%s) == "-M") cycle
-        flags_array = [flags_array, new_flags_array(i)]
+        call add_strings(flags_array, new_flags_array(i))
     end do
 end subroutine append_clean_flags_array
 

src/fpm_filesystem.F90

@@ -7,7 +7,8 @@ module fpm_filesystem
                                OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_WINDOWS, &
                                OS_CYGWIN, OS_SOLARIS, OS_FREEBSD, OS_OPENBSD
     use fpm_environment, only: separator, get_env, os_is_unix
-    use fpm_strings, only: f_string, replace, string_t, split, split_lines_first_last, dilate, str_begins_with_str
+    use fpm_strings, only: f_string, replace, string_t, split, split_lines_first_last, dilate, add_strings, &
+        str_begins_with_str
     use iso_c_binding, only: c_char, c_ptr, c_int, c_null_char, c_associated, c_f_pointer
     use fpm_error, only : fpm_stop, error_t, fatal_error
     implicit none
@@ -443,7 +444,7 @@ recursive subroutine list_files(dir, files, recurse)
             i = i + 1
 
             if (i > N_MAX) then
-                files = [files, files_tmp]
+                call add_strings(files, files_tmp)
                 i = 1
             end if
 
@@ -459,7 +460,7 @@ recursive subroutine list_files(dir, files, recurse)
     end if
 
     if (i > 0) then
-        files = [files, files_tmp(1:i)]
+        call add_strings(files, files_tmp(1:i))
     end if
 
     if (present(recurse)) then
@@ -470,11 +471,11 @@ recursive subroutine list_files(dir, files, recurse)
             do i=1,size(files)
                 if (c_is_dir(files(i)%s//c_null_char) /= 0) then
                     call list_files(files(i)%s, dir_files, recurse=.true.)
-                    sub_dir_files = [sub_dir_files, dir_files]
+                    call add_strings(sub_dir_files, dir_files)
                 end if
             end do
 
-            files = [files, sub_dir_files]
+            call add_strings(files, sub_dir_files)
         end if
     end if
 end subroutine list_files
@@ -531,12 +532,12 @@ recursive subroutine list_files(dir, files, recurse)
                 if (is_dir(files(i)%s)) then
 
                     call list_files(files(i)%s, dir_files, recurse=.true.)
-                    sub_dir_files = [sub_dir_files, dir_files]
+                    call add_strings(sub_dir_files, dir_files)
 
                 end if
             end do
 
-            files = [files, sub_dir_files]
+            call add_strings(files, sub_dir_files)
 
         end if
     end if

src/fpm_targets.f90

@@ -32,7 +32,7 @@ module fpm_targets
 use fpm_filesystem, only: dirname, join_path, canon_path
 use fpm_strings, only: string_t, operator(.in.), string_cat, fnv_1a, resize, lower, str_ends_with, &
     add_strings
-use fpm_compiler, only: get_macros
+use fpm_compiler, only: get_macros, is_cxx_gnu_based
 use fpm_sources, only: get_exe_name_with_suffix
 use fpm_manifest_library, only: library_config_t
 use fpm_manifest_preprocess, only: preprocess_config_t
@@ -317,8 +317,8 @@ subroutine build_target_list(targets,model,library)
 
     integer :: i, j, k, n_source, exe_type
     character(:), allocatable :: exe_dir, compile_flags, lib_name
-    logical :: with_lib, monolithic, shared_lib, static_lib
-
+    logical :: with_lib, monolithic, shared_lib, static_lib, clang_cxx_backend_macos
+    
     ! Initialize targets
     allocate(targets(0))
 
@@ -327,6 +327,12 @@ subroutine build_target_list(targets,model,library)
                       j=1,size(model%packages))])
 
     if (n_source < 1) return
+    
+    if (get_os_type()==OS_MACOS) then 
+        clang_cxx_backend_macos = .not. is_cxx_gnu_based(model%compiler%cxx)
+    else
+        clang_cxx_backend_macos = .false.
+    endif
 
     with_lib = any(model%packages%has_library())
 
@@ -436,10 +442,12 @@ subroutine build_target_list(targets,model,library)
 
                     !> Add stdc++ as a linker flag. If not already there.
                     if (.not. ("stdc++" .in. model%link_libraries)) then
-
-                        if (get_os_type() == OS_MACOS) then
+                        
+                        if (clang_cxx_backend_macos) then
+                            ! On macOS with non-GNU C++ compiler (e.g., Clang), use "c++"
                             call add_strings(model%link_libraries, string_t("c++"))
                         else
+                            ! For GNU C++ compiler or non-macOS systems, use "stdc++"
                             call add_strings(model%link_libraries, string_t("stdc++"))
                         end if
 
@@ -1010,7 +1018,7 @@ recursive subroutine collect_used_modules(target)
 
                 if (.not.(target%source%modules_provided(j)%s .in. modules_used)) then
 
-                    modules_used = [modules_used, target%source%modules_provided(j)]
+                    call add_strings(modules_used, target%source%modules_provided(j))
 
                 end if
 
@@ -1295,7 +1303,7 @@ recursive subroutine get_link_objects(link_objects,target,is_exe)
 
                 ! Add dependency object file to link object list
                 temp_str%s = dep%output_file
-                link_objects = [link_objects, temp_str]
+                call add_strings(link_objects, temp_str)
 
                 ! For executable objects, also need to include non-library
                 !  dependencies from dependencies (recurse)
@@ -1324,7 +1332,7 @@ subroutine add_include_build_dirs(model, targets)
             if (target%target_type /= FPM_TARGET_OBJECT) cycle
             if (target%output_dir .in. build_dirs) cycle
             temp%s = target%output_dir
-            build_dirs = [build_dirs, temp]
+            call add_strings(build_dirs, temp)
         end associate
     end do
 
@@ -1356,7 +1364,7 @@ subroutine get_library_dirs(model, targets, shared_lib_dirs)
             if (all(target%target_type /= [FPM_TARGET_SHARED,FPM_TARGET_ARCHIVE])) cycle
             if (target%output_dir .in. shared_lib_dirs) cycle
             temp = string_t(target%output_dir)
-            shared_lib_dirs = [shared_lib_dirs, temp]
+            call add_strings(shared_lib_dirs, temp)
         end associate
     end do
 

src/metapackage/fpm_meta_util.f90

@@ -45,7 +45,7 @@ subroutine add_pkg_config_compile_options(this, name, include_flag, libdir, erro
                 current_lib = string_t(libs(i)%s(3:))
                 if (len_trim(current_lib%s) == 0) cycle
                 this%has_link_libraries = .true.
-                this%link_libs = [this%link_libs, current_lib]
+                call add_strings(this%link_libs, current_lib)
             else ! -L and others: concatenate
                 this%has_link_flags = .true.
                 this%link_flags = string_t(trim(this%link_flags%s)//' '//libs(i)%s)
@@ -68,7 +68,7 @@ subroutine add_pkg_config_compile_options(this, name, include_flag, libdir, erro
                 current_include_dir = string_t(flags(i)%s(len(include_flag)+1:))
                 if (len_trim(current_include_dir%s) == 0) cycle
                 this%has_include_dirs = .true.
-                this%incl_dirs = [this%incl_dirs, current_include_dir]
+                call add_strings(this%incl_dirs, current_include_dir)
             else
                 this%has_build_flags = .true.
                 this%flags = string_t(trim(this%flags%s)//' '//flags(i)%s)