diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-16 14:10:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-16 14:10:56 +0100 |
commit | 257bcb1a1140d3e070cfaef6fec0704740bc83b8 (patch) | |
tree | 7b498d5f2cbb045276c53f02f9c5a9ac952ddad0 /solenv | |
parent | need to include gbuild.mk not gbuild_simple.mk for gb_PYTHON (diff) | |
download | core-257bcb1a1140d3e070cfaef6fec0704740bc83b8.tar.gz core-257bcb1a1140d3e070cfaef6fec0704740bc83b8.zip |
get internal python invocations working
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/gbuild.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/platform/ios.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/solaris.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/windows.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 3 |
7 files changed, 19 insertions, 1 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 6169cdc84da8..eb708ca771aa 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -334,7 +334,7 @@ gb_PYTHONTARGET := gb_PYTHON := $(PYTHON) else gb_PYTHONTARGET := $(OUTDIR)/bin/python -gb_PYTHON := $(gb_PYTHON_PRECOMMAND) PYTHONPATH=$(SOLARLIBDIR)/python $(gb_PYTHONTARGET) +gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) endif export gb_AWK diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index 7c2e7076422d..f9c903c06d71 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -447,4 +447,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLA # Configuration gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib +# Python +gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib + # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 51e4256d47c5..f71c5af0ea78 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -532,4 +532,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$( # Configuration gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib +# Python +gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib + # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 55f2f1f5d126..010a6b53959a 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -418,4 +418,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OU # Configuration gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib +# Python +gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload + # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 362b378fee7e..f142e4a626ee 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -504,4 +504,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OU # Configuration gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib +# Python +gb_PYTHON_PRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload + # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index f51bce65ef58..203ed8120fcf 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -761,4 +761,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_RE # Configuration gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" +# Python +gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload" + # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index d5cdb3ec9ad0..18d71bdd4b73 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -685,4 +685,7 @@ gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_ # Configuration gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" +# Python +gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload" + # vim: set noet sw=4: |