Merge pull request #4875 from mglae/le10_fix_nss

nss: fix building libnss3 again
This commit is contained in:
CvH 2021-01-06 20:54:45 +01:00 committed by GitHub
commit 04439b37df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,7 +25,6 @@ make_host() {
PREFIX=$TOOLCHAIN \ PREFIX=$TOOLCHAIN \
NSPR_INCLUDE_DIR=$TOOLCHAIN/include/nspr \ NSPR_INCLUDE_DIR=$TOOLCHAIN/include/nspr \
USE_SYSTEM_ZLIB=1 ZLIB_LIBS="-lz -L$TOOLCHAIN/lib" \ USE_SYSTEM_ZLIB=1 ZLIB_LIBS="-lz -L$TOOLCHAIN/lib" \
NSS_BUILD_UTIL_ONLY=1 \
SKIP_SHLIBSIGN=1 \ SKIP_SHLIBSIGN=1 \
NSS_TESTS="dummy" \ NSS_TESTS="dummy" \
CC=$CC LDFLAGS="$LDFLAGS -L$TOOLCHAIN/lib" \ CC=$CC LDFLAGS="$LDFLAGS -L$TOOLCHAIN/lib" \
@ -56,7 +55,6 @@ make_target() {
NSPR_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include/nspr \ NSPR_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include/nspr \
NSS_USE_SYSTEM_SQLITE=1 \ NSS_USE_SYSTEM_SQLITE=1 \
USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \ USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
NSS_BUILD_UTIL_ONLY=1 \
SKIP_SHLIBSIGN=1 \ SKIP_SHLIBSIGN=1 \
OS_TEST=$TARGET_ARCH \ OS_TEST=$TARGET_ARCH \
NSS_TESTS="dummy" \ NSS_TESTS="dummy" \