diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 00:25:56 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 00:25:56 +0300 |
| commit | dc4b364172abe32aed937e7980319b72727213c3 (patch) | |
| tree | 6deda0de95f6dd90bb3c47f1e4846430b05b2857 /solenv/inc | |
| parent | Set OOO_LIBRARY_PATH_VAR as for the BUILD platform when cross-compiling (diff) | |
| download | core-dc4b364172abe32aed937e7980319b72727213c3.tar.gz core-dc4b364172abe32aed937e7980319b72727213c3.zip | |
Need to special-case AUGMENT_LIBRARY_PATH for cross-compilation to Windows, sigh
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 8c94eefaf474..44b1ff7042c1 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1011,10 +1011,19 @@ DLLPOSTFIX=lo # an existing office/URE installation; the ": &&" enables this to work at the # start of a recipe line that is not prefixed by "+" as well as in the middle of # an existing && chain: +.IF "$(CROSS_COMPILING)"=="YES" && "$(OS)"=="WNT" +# Sigh, special-case cross-compiling to Windows. Here OOO_LIBRARY_PATH_VAR is the correct one +# for the BUILD platform but SOLARSHAREDBIN is the one for Windows, i.e. "foo/bin". +AUGMENT_LIBRARY_PATH = : && \ + $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARLIBDIR_FOR_BUILD))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}} +AUGMENT_LIBRARY_PATH_LOCAL = : && \ + $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}} +.ELSE AUGMENT_LIBRARY_PATH = : && \ $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}} AUGMENT_LIBRARY_PATH_LOCAL = : && \ $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}} +.ENDIF .END # for multiprocess building in external modules |