diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-31 00:54:36 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-31 00:54:36 +0200 |
| commit | 59a487e52457d7ba3c7d8f8ca490c16ef1125cb7 (patch) | |
| tree | 016378b1aded447655058b381825282ab6808cac /svtools/Library_svt.mk | |
| parent | 85c933278b6514ac918ebba0cbc2b755dc299e3c (diff) | |
Fix 64bit build with Java (conflicting libjpeg).
Diffstat (limited to 'svtools/Library_svt.mk')
| -rw-r--r-- | svtools/Library_svt.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index da2721476c70..1c0354ecb22f 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -79,6 +79,9 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ $(eval $(call gb_Library_set_ldflags,svt,\ $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ )) +$(eval $(call gb_Library_set_ldflags,svt,\ + $$(filter-out -L/usr/lib64/jvm%,$$(LDFLAGS)) \ +)) else $(eval $(call gb_Library_add_linked_static_libs,svt,\ jpeglib \ |