开源软件构建与测试

Changes of Revision 9

_service:tar_scm:cpp17_filesystem_namespace.patch Changed

@@ -33,24 +33,21 @@
  /* Use the highest version of SPIRV supported by SPIRV-Tools. */
  constexpr spv_target_env spirv_target = SPV_ENV_UNIVERSAL_1_5;
 diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build
-index caae07e..702b240 100644
+index caae07e..a348740 100644
 --- a/src/compiler/clc/meson.build
 +++ b/src/compiler/clc/meson.build
-@@ -59,6 +59,8 @@ if dep_llvm.version().version_compare('>= 14.0')
+@@ -59,6 +59,14 @@ if dep_llvm.version().version_compare('>= 14.0')
    _libclc_cpp_args += '-DHAS_SPIRV_1_4=1'
  endif
  
-+fs_dep = dependency('stdc++fs', required : false)
++cpp = meson.get_compiler('cpp')
++if cpp.get_id() == 'clang'
++  _libclc_cpp_args = '-lc++fs'
++elif cpp.get_id() == 'gcc'
++  _libclc_cpp_args = '-lstdc++fs'
++endif
++
 +
  _libclc = static_library(
    'libclc',
    files_libclc,
-@@ -66,7 +68,7 @@ _libclc = static_library(
-   include_directories : inc_include, inc_src, inc_mapi, inc_mesa, inc_compiler, inc_spirv,
-   cpp_args : _libclc_cpp_args,
-   dependencies: idep_nir_headers, dep_clang, dep_llvm, dep_llvmspirvlib,
--                 idep_mesautil, idep_nir, dep_spirv_tools
-+                 idep_mesautil, idep_nir, dep_spirv_tools, fs_dep
- )
- 
- idep_clc = declare_dependency(

_service Changed