Skip to content

Commit

Permalink
Fix libunwind putting libraries into lib64 on ppc64le
Browse files Browse the repository at this point in the history
  • Loading branch information
staticfloat committed Mar 26, 2019
1 parent 62cdf01 commit 6f6040c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
3 changes: 2 additions & 1 deletion LibUnwind/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ cd $WORKSPACE/srcdir/libunwind*/
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/libunwind-prefer-extbl.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/libunwind-static-arm.patch
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/libunwind-configure-ppc64le.patch
./configure --prefix=$prefix --host=$target CFLAGS="${CFLAGS} -fPIC"
./configure --prefix=$prefix --host=$target CFLAGS="${CFLAGS} -fPIC" --libdir=${prefix}/lib
make -j${nproc}
make install
"""
Expand Down
15 changes: 15 additions & 0 deletions LibUnwind/bundled/patches/libunwind-configure-ppc64le.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- a/configure 2019-03-26 03:46:55.540423566 -0400
+++ b/configure 2019-03-26 03:47:11.765002029 -0400
@@ -17182,12 +17182,6 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_dwarf" >&5
$as_echo "$use_dwarf" >&6; }

-if test x$target_arch = xppc64; then
- libdir='${exec_prefix}/lib64'
- { $as_echo "$as_me:${as_lineno-$LINENO}: PowerPC64 detected, lib will be installed ${libdir}" >&5
-$as_echo "$as_me: PowerPC64 detected, lib will be installed ${libdir}" >&6;};
-
-fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to restrict build to remote support" >&5
$as_echo_n "checking whether to restrict build to remote support... " >&6; }

0 comments on commit 6f6040c

Please sign in to comment.