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

Jump to bottom

Temporarily patch architecture confusion when cross-compiling on mac #3619

Merged
merged 12 commits into from
Jan 30, 2024
Merged

Temporarily patch architecture confusion when cross-compiling on mac #3619

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
09e62f7
Temporarily patch architecture confusion when cross-compiling on mac
adamfarley Jan 26, 2024
2cc403c
Tidying the fix for simplicity
adamfarley Jan 26, 2024
fc2e29f
Fixing typo in if statement
adamfarley Jan 26, 2024
fcac5dc
Tidying IFs and fixing the arch capitalization
adamfarley Jan 26, 2024
81975da
Adding square brackets to permit regex
adamfarley Jan 26, 2024
aa8d14e
Debug messages
adamfarley Jan 26, 2024
9e550e7
Adding another debug comment
adamfarley Jan 26, 2024
211c633
Changing to lowercase to match previous behaviour
adamfarley Jan 26, 2024
33586d2
Remove debug statement
sxa Jan 26, 2024
e3afec7
Remove debug statement
sxa Jan 26, 2024
f6f4d3e
Remove debug statement
sxa Jan 26, 2024
14a209f
Remove debug statement
sxa Jan 26, 2024
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
23 changes: 21 additions & 2 deletions sbin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,16 @@ generateSBoM() {
# Below add property to metadata
# Add OS full version (Kernel is covered in the first field)
addSBOMMetadataProperty "${javaHome}" "${classpath}" "${sbomJson}" "OS version" "${BUILD_CONFIG[OS_FULL_VERSION]^}"
addSBOMMetadataProperty "${javaHome}" "${classpath}" "${sbomJson}" "OS architecture" "${BUILD_CONFIG[OS_ARCHITECTURE]^}"
# TODO: Replace this "if" with its predecessor (commented out below) once
# OS_ARCHITECTURE has been replaced by the new target architecture variable.
# This is because OS_ARCHITECTURE is currently the build arch, not the target arch,
# and that confuses things when cross-compiling an x64 mac build on arm mac.
# addSBOMMetadataProperty "${javaHome}" "${classpath}" "${sbomJson}" "OS architecture" "${BUILD_CONFIG[OS_ARCHITECTURE]^}"
if [[ "${BUILD_CONFIG[TARGET_FILE_NAME]}" =~ .*_x64_.* ]]; then
adamfarley marked this conversation as resolved.
Show resolved Hide resolved
addSBOMMetadataProperty "${javaHome}" "${classpath}" "${sbomJson}" "OS architecture" "x86_64"
else
addSBOMMetadataProperty "${javaHome}" "${classpath}" "${sbomJson}" "OS architecture" "${BUILD_CONFIG[OS_ARCHITECTURE]^}"
fi

# Set default SBOM formulation
addSBOMFormulation "${javaHome}" "${classpath}" "${sbomJson}" "CycloneDX"
Expand Down Expand Up @@ -1354,14 +1363,24 @@ cleanAndMoveArchiveFiles() {
if [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" = "x86_64" ]; then
osArch="amd64"
fi

# TODO: Remove the "if" below once OS_ARCHITECTURE has been replaced.
# This is because OS_ARCHITECTURE is currently the build arch, not the target arch,
# and that confuses things when cross-compiling an x64 mac build on arm mac.
if [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" = "arm64" ]; then
if [[ "${BUILD_CONFIG[TARGET_FILE_NAME]}" =~ .*_x64_.* ]]; then
osArch="amd64"
fi
fi

pushd ${staticLibsImagePath}
case "${BUILD_CONFIG[OS_KERNEL_NAME]}" in
*cygwin*)
# on Windows the expected layout is: lib/static/windows-amd64/
staticLibsDir="lib/static/windows-${osArch}"
;;
darwin)
# on MacOSX the layout is: Contents/Home/lib/static/darwin-amd64/
# On MacOSX the layout is: Contents/Home/lib/static/darwin-[target architecture]/
staticLibsDir="Contents/Home/lib/static/darwin-${osArch}"
;;
linux)
Expand Down
Loading