summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-05-08 19:56:48 +0200
committerMichael Stahl <mstahl@redhat.com>2013-05-10 17:56:24 +0200
commitc007292ec3eedcf2b1ad673308fa42aad31a7333 (patch)
tree40cb5a7b6e854db9e575ad65a83f2868accd328a /desktop
parent09373d45838e4dab514e37dee4a4c8f6218ebda0 (diff)
gbuild: gcc platforms: link with C compiler if no C++ files
In 5589c72b88e502bfca045ae38af16c854afdd401 a problem due to linking pyuno_wrapper with g++ was fixed: the library should not have a dependency on libstdc++. It's possible to implement this in gbuild directly by checking whether there are any C++ input files. (apparently on GNU/Linux g++ implicitly links in libm too...) Change-Id: I04dce06f796e20047ce7f5eab65e6110c0244445
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Executable_oosplash.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 51657fe40d9f..1e75f647a987 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -55,6 +55,12 @@ $(eval $(call gb_Executable_use_externals,oosplash,\
endif
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_libs,oosplash,\
+ -lm \
+))
+endif
+
ifeq ($(OS),SOLARIS)
$(eval $(call gb_Executable_add_libs,oosplash,\