diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-05 22:03:38 +0100 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-03-12 08:10:49 +0000 |
| commit | e482672b5893cfd307d09a993fa83cb9be9aacb7 (patch) | |
| tree | 4d6b0e371f864794906e91c4c3d4a6dd20d88dd2 /nss | |
| parent | 5a2cfa677356f77cda15365dd9107ce503e11dd4 (diff) | |
use system python for building if possible
Also simplifies configure, hopefully without any mistake;)
Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1
Reviewed-on: https://gerrit.libreoffice.org/2563
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/ExternalProject_nss.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index 7de780b89ca9..6e9b36349a0b 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject else -$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) +$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ CC="$(CC) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ CXX="$(CXX) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ @@ -58,13 +58,13 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject OS_TARGET=WINNT RC="$(WINDRES)" OS_RELEASE="5.0" \ IMPORT_LIB_SUFFIX=dll.a \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-shared --disable-static" \ - NSINSTALL="$(PYTHON_FOR_BUILD) $(SRCDIR)/nss/nsinstall.py" \ + NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py" \ $(MAKE) -j1 nss_build_all \ ,mozilla/security/nss) endif else # OS!=WNT -$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) +$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ @@ -72,7 +72,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(filter YES,$(CROSS_COMPILING)),\ $(if $(filter MACOSXP,$(OS)$(CPU)),CPU_ARCH=ppc) \ - NSINSTALL="$(PYTHON_FOR_BUILD) $(SRCDIR)/nss/nsinstall.py") \ + NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py") \ NSDISTMODE=copy \ $(MAKE) -j1 nss_build_all \ ,mozilla/security/nss) |