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

build(guix): add debug symbols for osx #5708

Merged
merged 5 commits into from
Nov 16, 2023
Merged

build(guix): add debug symbols for osx #5708

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01ae5b3
guix: make osx_debug
PastaPastaPasta Nov 16, 2023
b7acea6
guix: make osx_debug; split out debug archives
PastaPastaPasta Nov 16, 2023
8811c66
fixes
UdjinM6 Nov 16, 2023
73bc1b9
guix: do not strip macos binaries
UdjinM6 Nov 16, 2023
17ab193
only call osx_debug for darwin
PastaPastaPasta Nov 16, 2023
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
28 changes: 18 additions & 10 deletions contrib/guix/libexec/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,13 @@ mkdir -p "$DISTSRC"
# Build Dash Core
make --jobs="$JOBS" ${V:+V=1}

# Make macos-specific debug symbols
case "$HOST" in
*darwin*)
make -C src/ osx_debug
;;
esac

# Check that symbol/security checks tools are sane.
make test-security-check ${V:+V=1}
# Perform basic security checks on a series of executables.
Expand All @@ -307,14 +314,7 @@ mkdir -p "$DISTSRC"
INSTALLPATH="${PWD}/installed/${DISTNAME}"
mkdir -p "${INSTALLPATH}"
# Install built Dash Core to $INSTALLPATH
case "$HOST" in
*darwin*)
make install-strip DESTDIR="${INSTALLPATH}" ${V:+V=1}
;;
*)
make install DESTDIR="${INSTALLPATH}" ${V:+V=1}
;;
esac
make install DESTDIR="${INSTALLPATH}" ${V:+V=1}

case "$HOST" in
*darwin*)
Expand Down Expand Up @@ -354,7 +354,10 @@ mkdir -p "$DISTSRC"
rm -rf "${DISTNAME}/lib/pkgconfig"

case "$HOST" in
*darwin*) ;;
*darwin*)
# Copy dSYM-s
find ../src -name "*.dSYM" -exec cp -ra {} "${DISTNAME}/bin" \;
;;
*)
# Split binaries and libraries from their debug symbols
{
Expand Down Expand Up @@ -403,11 +406,16 @@ mkdir -p "$DISTSRC"
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-debug.tar.gz" && exit 1 )
;;
*darwin*)
find "${DISTNAME}" -print0 \
find "${DISTNAME}" -not -path "*.dSYM*" -print0 \
| sort --zero-terminated \
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
| gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" \
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" && exit 1 )
find "${DISTNAME}" -path "*.dSYM*" -print0 \
| sort --zero-terminated \
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
| gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-debug.tar.gz" \
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-debug.tar.gz" && exit 1 )
;;
esac
) # $DISTSRC/installed
Expand Down
Loading