diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-21 02:47:53 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-21 02:47:53 +0300 |
| commit | c8127045308fc81ea02e76f0268b3d64c10ecf51 (patch) | |
| tree | aa3b2a2ee4d44e731abd9369bfa6eae4e66eb3d7 /i18npool | |
| parent | Use the import library name that i18npool expects with MinGW (diff) | |
| download | core-c8127045308fc81ea02e76f0268b3d64c10ecf51.tar.gz core-c8127045308fc81ea02e76f0268b3d64c10ecf51.zip | |
Fix for cross-compiling with MinGW
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/localedata/data/makefile.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk index 4668785231ea..c93a3f316165 100644 --- a/i18npool/source/localedata/data/makefile.mk +++ b/i18npool/source/localedata/data/makefile.mk @@ -36,7 +36,7 @@ LIBTARGET=NO debug!= .ENDIF -.IF "$(OS)" == "WNT" +.IF "$(OS_FOR_BUILD)" == "WNT" my_file = file:/// .ELSE my_file = file:// @@ -326,12 +326,20 @@ MY_MISC_CXXFILES := $(foreach,i,$(DEPOBJFILES) $(MISC)/$(i:b).cxx) .INCLUDE : target.mk -$(MY_MISC_CXXFILES) : $(OUT_FOR_BUILD)$/bin$/saxparser$(EXECPOST) $(MISC)/saxparser.rdb +$(MY_MISC_CXXFILES) : $(OUT_FOR_BUILD)$/bin$/saxparser$(EXECPOST_FOR_BUILD) $(MISC)/saxparser.rdb + +.IF "$(CROSS_COMPILING)" == "YES" +# Always cross-compiling from some Unix, +# so the BUILD platform's lib directory is correct +sharedlibdir=$(SOLARLIBDIR_FOR_BUILD) +.ELSE +sharedlibdir=$(SOLARSHAREDBIN) +.ENDIF $(MISC)$/localedata_%.cxx : %.xml $(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(OUT_FOR_BUILD)$/bin$/saxparser $* $< $@ \ $(my_file)$(PWD)/$(MISC_FOR_BUILD)/saxparser.rdb $(SOLARBINDIR)$/types.rdb \ - -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(SOLARSHAREDBIN) + -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(sharedlibdir) $(RM) $(BIN)$/$(@:b).rdb $(MISC)/saxparser.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ |