diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 15:19:14 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-23 19:21:14 +0200 |
| commit | e353b2bcc26b8f6c12a916dcd67587ea89f3db55 (patch) | |
| tree | 50812924eb40d274ada6d100b384bda210d5d18b /solenv/gbuild/platform | |
| parent | a92f80fdca36976ecfaed84eaf29b14f5503603a (diff) | |
icu: use executables from WORKDIR
Change-Id: I74b9d1dbcb3e8f7f2cc092dad60266cf60475367
Diffstat (limited to 'solenv/gbuild/platform')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 1bb16ba95d04..88542e1244a8 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -228,4 +228,7 @@ gb_LinkTarget_get_linksearchpath_for_layer = \ $(patsubst $(layer):%,-L%,\ $(filter $(layer):%,$(gb_Library_LAYER_DIRS)))) + +gb_ICU_PRECOMMAND := $(call gb_Helper_extend_ld_path,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2648591c67bb..8e00102b05f0 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -572,4 +572,6 @@ gb_UIMenubarTarget_UIMenubarTarget_platform := gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program" gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe +gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w $(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)" + # vim: set noet sw=4: |