Skip to content

Commit

Permalink
Don't use the new linker on Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
amontoison committed Feb 8, 2025
1 parent 6e7e2b6 commit 9d64b7d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .github/julia/build_tarballs_yggdrasil.jl
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,5 @@ dependencies = [
]

# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version = v"9.1.0", julia_compat="1.9")
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
preferred_gcc_version = v"9.1.0", julia_compat="1.9", use_clang_lld=false)
23 changes: 8 additions & 15 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -97,34 +97,34 @@ endif
# OpenMP
if fc.get_id() == 'nvidia_hpc'
add_global_arguments('-mp', language : 'fortran')
add_global_link_arguments('-mp', language : 'fortran')
elif fc.get_id() == 'nagfor'
add_global_arguments('-openmp', language : 'fortran')
add_global_link_arguments('-openmp', language : 'fortran')
elif fc.get_id() == 'gcc'
add_global_arguments('-fopenmp', language : 'fortran')
add_global_link_arguments('-fopenmp', language : 'fortran')
elif fc.get_id() == 'intel' or fc.get_id() == 'intel-llvm'
add_global_arguments('-qopenmp', language : 'fortran')
add_global_link_arguments('-qopenmp', language : 'fortran')
elif fc.get_id() == 'intel-cl' or fc.get_id() == 'intel-llvm-cl'
add_global_arguments('/Qopenmp', language : 'fortran')
endif

if cxx.get_id() == 'nvidia_hpc'
add_global_arguments('-mp', language : 'cpp')
add_global_link_arguments('-mp', language : 'cpp')
elif cxx.get_id() == 'gcc' or cxx.get_id() == 'clang' or cxx.get_id() == 'clang-cl'
add_global_arguments('-fopenmp', language : 'cpp')
add_global_link_arguments('-fopenmp', language : 'cpp')
elif cxx.get_id() == 'intel' or cxx.get_id() == 'intel-llvm'
add_global_arguments('-qopenmp', language : 'cpp')
add_global_link_arguments('-qopenmp', language : 'cpp')
elif cxx.get_id() == 'intel-cl' or cxx.get_id() == 'intel-llvm-cl'
add_global_arguments('/Qopenmp', language : 'cpp')
endif

# Link flags for C++
libomp = '-lgomp'
if host_machine.system() == 'darwin' or host_machine.system() == 'freebsd'
if cxx.get_id() == 'clang'
libomp = '-lomp'
endif
endif

# Link flag for C++
lstdcpp = '-lstdc++'
if host_machine.system() != 'linux'
if cxx.get_id() == 'clang' or cxx.get_id() == 'clang-cl'
Expand All @@ -138,13 +138,6 @@ if host_machine.system() != 'linux'
endif
endif

libomp = '-lgomp'
if host_machine.system() == 'darwin' or host_machine.system() == 'freebsd'
if cxx.get_id() == 'clang'
libomp = '-lomp'
endif
endif

binspral_src = []
libspral_src = []
libspral_cpp_src = []
Expand Down

0 comments on commit 9d64b7d

Please sign in to comment.