complete merge

Author: perazz

src/fpm/manifest/feature.f90

@@ -40,12 +40,7 @@ module fpm_manifest_feature
     use fpm_error, only: error_t, fatal_error, syntax_error
     use fpm_environment, only: OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_WINDOWS, OS_CYGWIN, OS_SOLARIS, &
                              OS_FREEBSD, OS_OPENBSD, OS_ALL, OS_NAME, match_os_type
-    use fpm_compiler, only: compiler_enum, compiler_id_name, match_compiler_type, &
-                          id_unknown, id_gcc, id_f95, id_caf, &
-                          id_intel_classic_nix, id_intel_classic_mac, id_intel_classic_windows, &
-                          id_intel_llvm_nix, id_intel_llvm_windows, id_intel_llvm_unknown, &
-                          id_pgi, id_nvhpc, id_nag, id_flang, id_flang_new, id_f18, &
-                          id_ibmxl, id_cray, id_lahey, id_lfortran, id_all
+    use fpm_compiler, only: compiler_enum, compiler_id_name, match_compiler_type, id_all
     use fpm_strings, only: string_t, lower, operator(==)
     use tomlf, only: toml_table, toml_array, toml_key, toml_stat
     use fpm_toml, only: get_value, len, serializable_t, set_value, set_string, set_list, add_table, &

src/fpm/manifest/feature_collection.f90

@@ -15,8 +15,7 @@ module fpm_manifest_feature_collection
                           id_unknown, id_gcc, id_f95, id_caf, &
                           id_intel_classic_nix, id_intel_classic_mac, id_intel_classic_windows, &
                           id_intel_llvm_nix, id_intel_llvm_windows, id_intel_llvm_unknown, &
-                          id_pgi, id_nvhpc, id_nag, id_flang, id_flang_new, id_f18, &
-                          id_ibmxl, id_cray, id_lahey, id_lfortran, id_all
+                          id_pgi, id_nvhpc, id_nag, id_flang, id_lahey, id_lfortran, id_all
     use fpm_strings, only: string_t, lower, operator(==), split, str
     use tomlf, only: toml_table, toml_array, toml_key, toml_stat
     use fpm_toml, only: get_value, len, serializable_t, set_value, set_string, set_list, add_table, &

src/fpm/manifest/profiles.f90

@@ -53,11 +53,7 @@ module fpm_manifest_profile
                              OS_CYGWIN, OS_SOLARIS, OS_FREEBSD, OS_OPENBSD, OS_NAME, OS_ALL, &
                              validate_os_name, match_os_type
     use fpm_compiler, only: compiler_enum, compiler_id_name, match_compiler_type, &
-                          id_unknown, id_gcc, id_f95, id_caf, validate_compiler_name, &
-                          id_intel_classic_nix, id_intel_classic_mac, id_intel_classic_windows, &
-                          id_intel_llvm_nix, id_intel_llvm_windows, id_intel_llvm_unknown, &
-                          id_pgi, id_nvhpc, id_nag, id_flang, id_flang_new, id_f18, &
-                          id_ibmxl, id_cray, id_lahey, id_lfortran, id_all
+                            validate_compiler_name
     use fpm_filesystem, only: join_path
     implicit none
     public :: profile_config_t, new_profile, new_profiles, find_profile, DEFAULT_COMPILER