custom OS type

Author: perazz

src/fpm_compile_commands.F90

@@ -226,14 +226,17 @@ elemental subroutine cct_destroy(self)
     end subroutine cct_destroy
 
     !> Register a new compile command
-    subroutine cct_register(self, command, error)
+    subroutine cct_register(self, command, target_os, error)
 
         !> Instance of the serializable object
         class(compile_command_table_t), intent(inout) :: self
 
         !> Data structure
         character(len=*), intent(in) :: command
 
+        !> The target OS of the compile_commands.json (may be cross-compiling)
+        integer, intent(in) :: target_os
+        
         !> Error handling
         type(error_t), allocatable, intent(out) :: error    
 
@@ -250,7 +253,7 @@ subroutine cct_register(self, command, error)
         end if
 
         ! Tokenize the input command into args(:)
-        if (get_os_type()==OS_WINDOWS) then 
+        if (target_os==OS_WINDOWS) then 
             args = ms_split(command, ucrt=.true., success=sh_success)
         else
             args = sh_split(command, join_spaced=.false., keep_quotes=.true., success=sh_success)

src/fpm_compiler.F90

@@ -1141,7 +1141,7 @@ subroutine compile_fortran(self, input, output, args, log_file, stat, table, dry
 
     ! Optionally register compile command 
     if (present(table)) then 
-        call table%register(command, error)
+        call table%register(command, get_os_type(), error)
         stat = merge(-1,0,allocated(error))
     endif    
 
@@ -1186,7 +1186,7 @@ subroutine compile_c(self, input, output, args, log_file, stat, table, dry_run)
 
     ! Optionally register compile command 
     if (present(table)) then 
-        call table%register(command, error)
+        call table%register(command, get_os_type(), error)
         stat = merge(-1,0,allocated(error))
     endif        
 
@@ -1230,7 +1230,7 @@ subroutine compile_cpp(self, input, output, args, log_file, stat, table, dry_run
 
     ! Optionally register compile command 
     if (present(table)) then 
-        call table%register(command, error)
+        call table%register(command, get_os_type(), error)
         stat = merge(-1,0,allocated(error))
     endif               
 

src/fpm_targets.f90

@@ -908,7 +908,7 @@ subroutine resolve_target_linking(targets, model)
 
                 target%output_dir = get_output_dir(model%build_prefix, &
                    & target%compile_flags//local_link_flags)
-                target%output_file = join_path(target%output_dir, target%output_name)
+                target%output_file     = join_path(target%output_dir, target%output_name)
                 target%output_log_file = join_path(target%output_dir, target%output_name)//'.log'
         end if