diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-27 16:19:43 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-27 18:09:01 +0100 |
| commit | d729d169de479e622e8767edd72aee3ae5bc61a9 (patch) | |
| tree | 01000fbf6cc713644b308299bbfc743b20bc6d15 /external/nss | |
| parent | 8827b08dc3ab5a08e929815844737635201b3c1d (diff) | |
normalize values of CROSS_COMPILING
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
Diffstat (limited to 'external/nss')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 5d630bec824c..775ab5536ec7 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure): $(call gb_ExternalProject_run,configure,\ $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \ nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \ ,,nss_configure.log) @@ -62,7 +62,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ $(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,NSS_USE_SYSTEM_SQLITE=1)) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ - $(if $(filter YES,$(CROSS_COMPILING)),\ + $(if $(CROSS_COMPILING),\ $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \ NSDISTMODE=copy \ |