06c9e1d270
Change-Id: Ic1cb36b3a56cde40296fd46ef356dea286932692 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140231 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
15 lines
527 B
Groff
15 lines
527 B
Groff
regression from https://bugzilla.mozilla.org/show_bug.cgi?id=1646594
|
|
|
|
--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200
|
|
+++ nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200
|
|
@@ -94,8 +94,10 @@
|
|
OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
|
|
endif
|
|
KERNEL = Linux
|
|
+ifneq ($(OS_TARGET),Android)
|
|
include $(CORE_DEPTH)/coreconf/Linux.mk
|
|
endif
|
|
+endif
|
|
|
|
# Since all uses of OS_ARCH that follow affect only userland, we can
|
|
# merge other Glibc systems with Linux here.
|