a2969884af
Change-Id: Ia236c7124d920785f7a2856db5ee1ccbef7a2d68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143038 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
14 lines
537 B
Diff
14 lines
537 B
Diff
This fixes architecture mismatch, when building
|
|
on Cygwin 64bit and in 32bit mode
|
|
diff -ru nss.orig/nss/Makefile nss/nss/Makefile
|
|
--- a/nss.orig/nss/Makefile 2016-02-26 01:00:52.146713100 +0100
|
|
+++ b/nss/nss/Makefile 2016-02-26 01:02:05.303560100 +0100
|
|
@@ -63,6 +63,8 @@
|
|
# Translate coreconf build options to NSPR configure options.
|
|
#
|
|
|
|
+NSPR_CONFIGURE_OPTS += --host=i686-pc-cygwin
|
|
+
|
|
ifeq ($(OS_TARGET),Android)
|
|
NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
|
|
--target=$(ANDROID_PREFIX) \
|