diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-25 00:18:13 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-25 00:18:35 +0100 |
| commit | 4352326b6bd54805649961073ffea6dc41a66ed8 (patch) | |
| tree | 662371cb4ba3e7f48405a7ecc7744b5e27445d6e | |
| parent | 4da30c0b41b854a402e913b467d7e1a0a1b067a3 (diff) | |
fix windows build, properly set LO_LIB_DIR
| -rw-r--r-- | i18npool/CustomTarget_localedata.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index bd52876af912..48b611ec6432 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -44,7 +44,7 @@ $(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \ $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,saxparser) $* $< $@.tmp \ $(my_file)$(IPLD)/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \ - -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib \ + -env:LO_LIB_DIR=$(my_file)$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \ sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index e760d9ed809b..4018ebc6e50b 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -175,6 +175,7 @@ $(1) endef gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib +gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 59c23be6ea29..b09e4be7727a 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -28,6 +28,7 @@ GUI := WNT gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin +gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin gb_Helper_get_rcfile = $(1).ini |