clang-[16-18]: Move libc++*.* libraries to libc++ sub-dir

This avoids accidental linkage against these instead ofm the system versions.

See https://trac.macports.org/ticket/68640
This commit is contained in:
Chris Jones
2024-07-19 12:49:40 +01:00
parent a2ffe87471
commit a1d4865220
3 changed files with 31 additions and 1 deletions
+11 -1
View File
@@ -27,7 +27,7 @@ version ${llvm_version}.0.6
name llvm-${llvm_version}
revision 1
subport mlir-${llvm_version} { revision [ expr ${revision} + 0 ] }
subport clang-${llvm_version} { revision [ expr ${revision} + 2 ] }
subport clang-${llvm_version} { revision [ expr ${revision} + 3 ] }
subport lldb-${llvm_version} { revision [ expr ${revision} + 1 ] }
subport flang-${llvm_version} { revision [ expr ${revision} + 0 ] }
@@ -478,6 +478,16 @@ post-destroot {
macos-setup-codesign.sh \
${lldb_scripts_destdir}
}
if {${subport} eq "clang-${llvm_version}"} {
# move libc++ libraries out of default location to prevent accidental linkage
set libcxx_dir ${destroot}${sub_prefix}/lib/libc++
xinstall -d ${libcxx_dir}
foreach f [glob -nocomplain ${destroot}${sub_prefix}/lib/libc++*.*] {
ui_debug "Moving ${f} to ${libcxx_dir}"
move ${f} ${libcxx_dir}
}
}
}
if {${subport} eq "clang-${llvm_version}"} {
+10
View File
@@ -496,6 +496,16 @@ post-destroot {
}
}
}
if {${subport} eq "clang-${llvm_version}"} {
# move libc++ libraries out of default location to prevent accidental linkage
set libcxx_dir ${destroot}${sub_prefix}/lib/libc++
xinstall -d ${libcxx_dir}
foreach f [glob -nocomplain ${destroot}${sub_prefix}/lib/libc++*.*] {
ui_debug "Moving ${f} to ${libcxx_dir}"
move ${f} ${libcxx_dir}
}
}
}
if {${subport} eq "clang-${llvm_version}"} {
+10
View File
@@ -447,6 +447,16 @@ post-destroot {
}
}
}
if {${subport} eq "clang-${llvm_version}"} {
# move libc++ libraries out of default location to prevent accidental linkage
set libcxx_dir ${destroot}${sub_prefix}/lib/libc++
xinstall -d ${libcxx_dir}
foreach f [glob -nocomplain ${destroot}${sub_prefix}/lib/libc++*.*] {
ui_debug "Moving ${f} to ${libcxx_dir}"
move ${f} ${libcxx_dir}
}
}
}
if {${subport} eq "clang-${llvm_version}"} {