diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-19 19:30:31 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-20 01:12:23 +0200 |
| commit | 25e10370feb4d62b953c317169516737fe982a34 (patch) | |
| tree | 1e63db91da7682cd72a84450d6657e55e823c7b0 /sal | |
| parent | a3c01095c0bb8c37fd8ddb9ec7f4e2df5085a81a (diff) | |
Link most libs and executables with gb_STDLIBS as presumably is intended
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Library_lo-bootstrap.mk | 14 | ||||
| -rw-r--r-- | sal/Library_sal.mk | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk index f334eedb8499..a59ad5b76abd 100644 --- a/sal/Library_lo-bootstrap.mk +++ b/sal/Library_lo-bootstrap.mk @@ -25,18 +25,12 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -# Too many warnings from android_native_app_glue.[ch] -EXTERNAL_WARNINGS_NOT_ERRORS = TRUE - $(eval $(call gb_Library_Library,lo-bootstrap)) -# We don't want to link liblo-bootstrap.so against -# libgnustl_shared.so. The Android dynamic linker won't find it -# anyway. One very point of liblo-bootstrap is its wrapper for -# dlopen() that searches also in the app's lib folder for needed -# shared libraries. -$(eval $(call gb_Library_add_libs,lo-bootstrap,\ - -llog -landroid \ +# We explicitly *don't* want gb_STDLIBS to be linked here +$(eval $(call gb_Library_add_linked_libs,lo-bootstrap,\ + log \ + android \ )) $(eval $(call gb_Library_add_cobjects,lo-bootstrap,\ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 4bf8df18c6f5..93bc64649a88 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -55,8 +55,10 @@ $(eval $(call gb_Library_add_defs,sal,\ $(eval $(call gb_Library_add_linked_libs,sal,\ $(if $(filter $(GUI),UNX), \ - dl \ - pthread \ + $(if $(filter $(OS),ANDROID),, \ + dl \ + pthread \ + ) \ ) \ $(if $(filter $(OS),SOLARIS), \ nsl \ |