diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-29 10:07:07 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-29 12:57:50 +0100 |
| commit | 2e6d024ac589fd1df7f41a30cfdf47a2f1ded932 (patch) | |
| tree | b481114ac46cfd9860b15218ce07d332f5475378 | |
| parent | bbf2f413958e7be2bef34c62932fc76f83e7ed18 (diff) | |
fix internal python deps on MacOSX
This means we can put python3 back into tail_build, IMO.
Change-Id: I38b43f8fb0a0f91c42acb5acb3066b1e8596ceea
| -rw-r--r-- | RepositoryExternal.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ba57b556411c..583ef0b95d23 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2521,7 +2521,10 @@ define gb_ExternalExecutable__register_python $(call gb_ExternalExecutable_set_internal,python) $(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,python,\ - $(call gb_Package_get_target,python3) \ + $(if $(filter MACOSX,$(OS)) \ + ,$(call gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework) \ + ,$(call gb_Package_get_target_for_build,python3) \ + ) \ ) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 09966d20b4b0..d9213ec7dc91 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -60,6 +60,7 @@ gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb gb_UnoApiMerge_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1).rdb gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip +gb_Zip_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/pck/$(1).zip # outdir targets: $(1) is path gb_Configuration_registry = $(OUTDIR)/xml/registry gb_XcsTarget_get_outdir_target = \ |