author | Wolfgang Rosenauer <wr@rosenauer.org> |
Thu, 23 Aug 2018 16:35:52 +0200 | |
branch | firefox61 |
changeset 1065 | 33c6119b5cc5 |
parent 1033 | 51bfdd19b9e9 |
permissions | -rw-r--r-- |
869 | 1 |
# HG changeset patch |
2 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
|
1033
51bfdd19b9e9
rebased everything to apply cleanly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
3 |
# Parent f62746698c37af9593338fe75fbff6b319cd370c |
869 | 4 |
|
5 |
diff --git a/config/config.mk b/config/config.mk |
|
6 |
--- a/config/config.mk |
|
7 |
+++ b/config/config.mk |
|
1033
51bfdd19b9e9
rebased everything to apply cleanly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
8 |
@@ -471,17 +471,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android) |
869 | 9 |
# of the linker command line), if libmozglue.so ends up after libc.so, all |
10 |
# hell breaks loose, so better safe than sorry, and check it's actually the |
|
11 |
# case. |
|
12 |
CHECK_MOZGLUE_ORDER = @$(TOOLCHAIN_PREFIX)readelf -d $(1) | grep NEEDED | awk '{ libs[$$NF] = ++n } END { if (libs["[libmozglue.so]"] && libs["[libc.so]"] < libs["[libmozglue.so]"]) { print "libmozglue.so must be linked before libc.so"; exit 1 } }' |
|
13 |
endif |
|
14 |
||
15 |
define CHECK_BINARY |
|
899 | 16 |
$(call CHECK_GLIBC,$(1)) |
869 | 17 |
-$(call CHECK_STDCXX,$(1)) |
18 |
$(call CHECK_TEXTREL,$(1)) |
|
19 |
$(call LOCAL_CHECKS,$(1)) |
|
20 |
$(call CHECK_MOZGLUE_ORDER,$(1)) |
|
21 |
endef |
|
22 |
||
23 |
# autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including |
|
24 |
# this file |
|
25 |
OBJ_SUFFIX := $(_OBJ_SUFFIX) |