equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent e96e9b3997ea31024687aaa1e9aa5ccf78bc0ee9 |
3 # Parent 8f6d1846ca837387965573161577b1c5a483bcda |
4 |
4 |
5 diff --git a/config/config.mk b/config/config.mk |
5 diff --git a/config/config.mk b/config/config.mk |
6 --- a/config/config.mk |
6 --- a/config/config.mk |
7 +++ b/config/config.mk |
7 +++ b/config/config.mk |
8 @@ -653,17 +653,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android) |
8 @@ -579,17 +579,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android) |
9 # of the linker command line), if libmozglue.so ends up after libc.so, all |
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 |
10 # hell breaks loose, so better safe than sorry, and check it's actually the |
11 # case. |
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 } }' |
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 |
13 endif |