Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CompilerSupportLibraries] Upgrade to GCC 13 and move Win *.a files to subdir #7535

Merged
merged 1 commit into from
Oct 15, 2023
Merged

[CompilerSupportLibraries] Upgrade to GCC 13 and move Win *.a files to subdir #7535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions C/CompilerSupportLibraries/[email protected]/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
include("../common.jl")

build_csl(ARGS, v"1.1.0"; preferred_gcc_version=v"13", windows_staticlibs=true, julia_compat="1.11")

# Build trigger: 1
23 changes: 16 additions & 7 deletions C/CompilerSupportLibraries/common.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using BinaryBuilder, SHA
using BinaryBuilderBase: aatriplet

include("../../fancy_toys.jl")

Expand Down Expand Up @@ -63,7 +64,7 @@ done

## Now that we've got those tarballs, we're going to use them as sources to overwrite
## the libstdc++ and libgomp that we would otherwise get from our compiler shards:
script = "WINDOWS_STATICLIBS=$(windows_staticlibs)\nPREFERRED_GCC_VERSION=$(preferred_gcc_version)\n" * raw"""
script = "WINDOWS_STATICLIBS=$(windows_staticlibs)\nPREFERRED_GCC_VERSION=$(preferred_gcc_version)\nVERSION=$(version.major * 100 ^ 2 + version.minor * 100 + version.patch)\n" * raw"""
# Start by extracting LatestLibraries
tar -zxvf ${WORKSPACE}/srcdir/LatestLibraries*.tar.gz -C ${prefix}

Expand All @@ -82,9 +83,16 @@ done
if [[ ${target} == *mingw* ]]; then
cp -uav /opt/${target}/${target}/sys-root/bin/*.${dlext}* ${libdir}/
if [[ "${WINDOWS_STATICLIBS}" == "true" ]]; then
# Install also some static and import libraries, needed for linking
# From v1.1.0 of CSL we move the Windows `*.a` files to a subdir of `${prefix}/lib`.
# See <https://github.com/JuliaLang/julia/issues/48081>.
if [[ "${VERSION}" -ge 10100 ]]; then
destdir="${prefix}/lib/gcc/${target}/${PREFERRED_GCC_VERSION%.*.*}"
else
destdir="${prefix}/lib"
fi
# Install also some static and import libraries, needed for linking of pkgimages.
for lib in libmsvcrt.a libgcc.a libgcc_s.a libssp.dll.a; do
qfind "/opt/${target}" -name "${lib}" -exec install -Dvm 0644 '{}' "${prefix}/lib/${lib}" \;
qfind "/opt/${target}" -name "${lib}" -exec install -Dvm 0644 '{}' "${destdir}/${lib}" \;
done
fi
fi
Expand Down Expand Up @@ -154,11 +162,12 @@ install_license /usr/share/licenses/GPL-3.0+
common_products
end
if windows_staticlibs && Sys.iswindows(platform)
destdir = version >= v"1.1.0" ? "lib/gcc/$(aatriplet(platform))/$(preferred_gcc_version.major)" : "lib"
products = vcat(products,
[FileProduct("lib/libmsvcrt.a", :libmsvcrt_a),
FileProduct("lib/libgcc.a", :libgcc_a),
FileProduct("lib/libgcc_s.a", :libgcc_s_a),
FileProduct("lib/libssp.dll.a", :libssp_dll_a),
[FileProduct("$(destdir)/libmsvcrt.a", :libmsvcrt_a),
FileProduct("$(destdir)/libgcc.a", :libgcc_a),
FileProduct("$(destdir)/libgcc_s.a", :libgcc_s_a),
FileProduct("$(destdir)/libssp.dll.a", :libssp_dll_a),
])
end
if libc(platform) != "musl"
Expand Down