Wed Dec 22 16:10:43 2021 UTC ()
wasi-libcxx: Disable stack check explicitly too


(ryoon)
diff -r1.2 -r1.3 pkgsrc/lang/wasi-libcxx/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/lang/wasi-libcxx/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/wasi-libcxx/Makefile 2021/12/22 13:00:26 1.2
+++ pkgsrc/lang/wasi-libcxx/Makefile 2021/12/22 16:10:43 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2021/12/22 13:00:26 tnn Exp $ 1# $NetBSD: Makefile,v 1.3 2021/12/22 16:10:43 ryoon Exp $
2 2
3.include "../../lang/llvm/version.mk" 3.include "../../lang/llvm/version.mk"
4 4
5DISTNAME= libcxxabi-${LLVM_VERSION}.src 5DISTNAME= libcxxabi-${LLVM_VERSION}.src
6PKGNAME= ${DISTNAME:S/.src//:S/libcxxabi-/wasi-libcxx-/} 6PKGNAME= ${DISTNAME:S/.src//:S/libcxxabi-/wasi-libcxx-/}
7CATEGORIES= lang devel 7CATEGORIES= lang devel
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://libcxxabi.llvm.org/ 10HOMEPAGE= https://libcxxabi.llvm.org/
11COMMENT= C++ Standard Librares (libc++/libc++abi) for WASI/WebAssembly 11COMMENT= C++ Standard Librares (libc++/libc++abi) for WASI/WebAssembly
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14# libcxx requires libcxxabi's cxxabi.h to build, but libcxxabi requires 14# libcxx requires libcxxabi's cxxabi.h to build, but libcxxabi requires
@@ -26,27 +26,29 @@ DISTFILES= ${DEFAULT_DISTFILES} ${_EXTRA @@ -26,27 +26,29 @@ DISTFILES= ${DEFAULT_DISTFILES} ${_EXTRA
26BUILD_DEPENDS+= lld-[0-9]*:../../devel/lld 26BUILD_DEPENDS+= lld-[0-9]*:../../devel/lld
27 27
28CXXFLAGS+= -Wno-reserved-user-defined-literal 28CXXFLAGS+= -Wno-reserved-user-defined-literal
29# Workaround for header conflicts 29# Workaround for header conflicts
30BUILDLINK_TRANSFORM+= rm:-I/usr/include 30BUILDLINK_TRANSFORM+= rm:-I/usr/include
31BUILDLINK_TRANSFORM+= rm:-I${PREFIX}/include 31BUILDLINK_TRANSFORM+= rm:-I${PREFIX}/include
32 32
33BUILD_DIRS+= ../build_libcxx 33BUILD_DIRS+= ../build_libcxx
34BUILD_DIRS+= ../build_libcxxabi 34BUILD_DIRS+= ../build_libcxxabi
35INSTALL_DIRS+= ${BUILD_DIRS} 35INSTALL_DIRS+= ${BUILD_DIRS}
36 36
37USE_LANGUAGES= c c++ 37USE_LANGUAGES= c c++
38USE_CMAKE= yes 38USE_CMAKE= yes
39SSP_SUPPORTED= no 39
 40SSP_SUPPORTED= no
 41PKGSRC_USE_STACK_CHECK= no
40 42
41CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1 43CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1
42 44
43CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 45CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
44CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 46CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
45CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 47CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
46CMAKE_ARGS+= -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/${LIBCXX}/include 48CMAKE_ARGS+= -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/${LIBCXX}/include
47CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=ON 49CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=ON
48CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1 50CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1
49CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1 51CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1
50CMAKE_ARGS+= -DCXX_SUPPORTS_CXX11=ON 52CMAKE_ARGS+= -DCXX_SUPPORTS_CXX11=ON
51CMAKE_ARGS+= -DLLVM_COMPILER_CHECKED=ON 53CMAKE_ARGS+= -DLLVM_COMPILER_CHECKED=ON
52CMAKE_ARGS+= -DUNIX:BOOL=ON 54CMAKE_ARGS+= -DUNIX:BOOL=ON