diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-05-17 18:08:27 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-05-17 18:08:27 +0200 |
| commit | 334fd6c47c59b59ba4124734d6ee4203557edc83 (patch) | |
| tree | 87aebc0fc5a1bc8bd6e78429e6616b5d9712e0b5 /svtools/prj | |
| parent | be0b5a72d3e6213af839461d84648f58c50a9721 (diff) | |
CWS gnumake2: hacking the LD_LIBRARY_PATH for svt when using system jpeg (ugly, but slightly better than the hack in the old build system)
Diffstat (limited to 'svtools/prj')
| -rw-r--r-- | svtools/prj/target_lib_svt.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk index f688dd16fa71..97ad04823d14 100644 --- a/svtools/prj/target_lib_svt.mk +++ b/svtools/prj/target_lib_svt.mk @@ -72,6 +72,9 @@ ifeq ($(SYSTEM_JPEG),YES) $(eval $(call gb_Library_add_linked_libs,svt,\ jpeg \ )) +$(eval $(call gb_Library_set_ldflags,svt,\ + $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ +)) else $(eval $(call gb_Library_add_linked_static_libs,svt,\ jpeglib \ |