diff options
author | Daniel Bertalan <dani@danielbertalan.dev> | 2022-07-14 08:31:09 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-08-04 02:54:19 +0200 |
commit | 34ae69b99d334d37a82dd94449bfa9548fc2db16 (patch) | |
tree | 7601d0772f692d6acd2642599cfd9a61039809ab /Ports/bzip2/package.sh | |
parent | 407231f11c2817776c5b50480f48e7ea857258a4 (diff) | |
download | serenity-34ae69b99d334d37a82dd94449bfa9548fc2db16.zip |
Ports/bzip2: Set AR and RANLIB
bzip2's Makefile uses the '=' operator to set these variables so they
cannot be overridden by just the environment variables; we have to pass
them on the command line.
This change ensures that the system ar/ranlib are no longer used, so the
port can be build on macOS or non-x86 Linux.
Diffstat (limited to 'Ports/bzip2/package.sh')
-rwxr-xr-x | Ports/bzip2/package.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Ports/bzip2/package.sh b/Ports/bzip2/package.sh index 7a93db319b..dd81322f6e 100755 --- a/Ports/bzip2/package.sh +++ b/Ports/bzip2/package.sh @@ -7,9 +7,9 @@ makeopts=("bzip2") installopts=("PREFIX=${SERENITY_INSTALL_ROOT}/usr/local") build() { - run make CC="${CC}" "${makeopts[@]}" bzip2 + run make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" "${makeopts[@]}" bzip2 } install() { - run make DESTDIR=${SERENITY_INSTALL_ROOT} CC="${CC}" "${installopts[@]}" install + run make DESTDIR=${SERENITY_INSTALL_ROOT} CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" "${installopts[@]}" install } |