diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2022-01-13 19:53:12 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2022-01-13 19:53:12 +0000 |
| commit | d757e043ea02a950e9a723090e3c16f4bfe5154f (patch) | |
| tree | 648b2f46b0009a65c29eb5ea586a00fdd15bf816 | |
| parent | e3d7fd722c6bd6a498e54596e4fc033746de7282 (diff) | |
| download | pkgsrc-d757e043ea02a950e9a723090e3c16f4bfe5154f.tar.gz | |
Pullup ticket #6565 - requested by gutteridge
lang/wasi-libcxx: build fix
Revisions pulled up:
- lang/wasi-libcxx/Makefile 1.8
---
Module Name: pkgsrc
Committed By: gutteridge
Date: Mon Jan 10 02:10:04 UTC 2022
Modified Files:
pkgsrc/lang/wasi-libcxx: Makefile
Log Message:
wasi-libcxx: carry over wasi-compiler-rt fix for Firefox builds
Also apply tnn@'s workaround in wasi-compiler-rt here, as related
failures have been observed due to this package. See PR pkg/56590.
(Tested with multiple iterations on NetBSD 9.2_STABLE.)
| -rw-r--r-- | lang/wasi-libcxx/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lang/wasi-libcxx/Makefile b/lang/wasi-libcxx/Makefile index 8febebe2d71..f74d091a36f 100644 --- a/lang/wasi-libcxx/Makefile +++ b/lang/wasi-libcxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4.2.1 2022/01/09 20:10:55 bsiegert Exp $ +# $NetBSD: Makefile,v 1.4.2.2 2022/01/13 19:53:12 bsiegert Exp $ .include "../../lang/llvm/version.mk" @@ -167,6 +167,15 @@ do-configure: ${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \ cmake ${CMAKE_ARGS} ../libcxxabi +# Run llvm-ranlib again on the archives. Fixes mystery build failure +# in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS +# problem in this package? +post-install: + ${PREFIX}/bin/llvm-ranlib \ + ${DESTDIR}${PREFIX}/wasi/lib/wasm32-wasi/libc++.a + ${PREFIX}/bin/llvm-ranlib \ + ${DESTDIR}${PREFIX}/wasi/lib/wasm32-wasi/libc++abi.a + .include "../../lang/llvm/buildlink3.mk" .include "../../lang/wasi-libc/buildlink3.mk" .include "../../lang/wasi-compiler-rt/buildlink3.mk" |