diff options
| author | Rene Engelhard <rene@debian.org> | 2017-11-08 19:47:17 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2017-11-08 19:47:17 +0100 |
| commit | 71183661e66d2e2897c999f39772a324c28a3bf7 (patch) | |
| tree | 2b5b16f9054398dbba6a18620343d72179bd557d /odk | |
| parent | 020a02c3477284daa3465e48afcc8257fb5a6201 (diff) | |
fix also odk/settings/settings.mk wrt Java 9 to find jawt
since we can't use HAVE_JAVA= here since it's in a different environment and
we don't know the Java version just do the -L. Doesn't do harm if Java
has the "old" path
Change-Id: I2f912c417597d3b14e570f362f2cfc2df5954108
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/settings/settings.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 2813959f5dec..e21d33829ba9 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -376,7 +376,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" -LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" +LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -L"$(OO_SDK_JAVA_HOME)/lib" URE_MISC=$(OFFICE_PROGRAM_PATH) |