diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-15 08:29:54 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-15 08:29:54 +0000 |
| commit | 6db9c5af960f9787e33e4addc56bddbb1695a402 (patch) | |
| tree | 495ca68dcd31e570d0c1795a6490e15fb7e02d7f /odk/settings | |
| parent | c5f974287fd04bb529de145113133b9e35687702 (diff) | |
INTEGRATION: CWS jsc3 (1.18.4); FILE MERGED
2006/03/07 13:45:14 jsc 1.18.4.1: #i62434# extend link options for executbales to link libsalcpprt.a, LINUX only
Diffstat (limited to 'odk/settings')
| -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 0826d2d7b725..00d0ddeac4ed 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -303,7 +303,7 @@ LIBRARY_LINK_FLAGS+=-fPIC endif COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -Wl,--version-script,$(PRJ)/settings/component.uno.map -EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs +EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L"$(OFFICE_PROGRAM_PATH)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" |