diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-22 12:50:29 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-22 13:24:17 +0200 |
| commit | ce7d6d74d51063c0d49ccb3f1731120d6f6f2ca5 (patch) | |
| tree | b950aa1cbf212df5288c707cb00d2fafd987286c /bridges | |
| parent | 1b034ebe04ba36d8738b3445ce5615f1492868eb (diff) | |
bridges: do not use dl for Android
Change-Id: I1ea75cc785645305223294f1a75b142de9d916d7
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/Library_gcc3_linux_arm.mk | 7 | ||||
| -rw-r--r-- | bridges/Library_gcc3_linux_intel.mk | 4 | ||||
| -rw-r--r-- | bridges/Library_gcc3_linux_mips.mk | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index 4e6f03490f1d..c14988872b4e 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -38,13 +38,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ + $(if $(filter-out ANDROID,$(OS)),\ + dl \ + ) \ sal \ )) -$(eval $(call gb_Library_add_asmobjects,gcc3_uno,\ -)) - $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/shared/bridge \ bridges/source/cpp_uno/shared/component \ diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index d67a1b866a70..88d4bf0aeaa2 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -41,7 +41,9 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ + $(if $(filter-out ANDROID,$(OS)),\ + dl \ + ) \ sal \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index c33d207e9fb5..e791e136ead9 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -38,7 +38,9 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ cppu \ - dl \ + $(if $(filter-out ANDROID,$(OS)),\ + dl \ + ) \ sal \ )) |