diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 00:17:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-23 00:37:11 +0200 |
| commit | cffad630256b5a7f9bb9c075d39b71b7c4f4c989 (patch) | |
| tree | 5f37c6f0c893ef0b3c92094d50a243af5c3f7137 /nss/ExternalProject_nss.mk | |
| parent | d2f62c32e01e186f3cc0ffe7f9341be86d7f42b5 (diff) | |
nss: remove nss-config and nspr-config
Apparently curl is the only external that is looking for these,
but it turns out that we already pass --with-nss=dir to its configure
which overrides the nss-config/nspr-config calls.
Change-Id: I967e74a74690a64b5bccfd98d1509bba1dd12259
Diffstat (limited to 'nss/ExternalProject_nss.mk')
| -rw-r--r-- | nss/ExternalProject_nss.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index 843a1534ba13..89f4e746a886 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -20,13 +20,6 @@ $(call gb_ExternalProject_get_state_target,nss,configure): mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \ - && sed -e 's%@prefix@%$(OUTDIR)%' \ - -e 's%@includedir@%$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss%' \ - -e 's%@MOD_MAJOR_VERSION@%$(NSS_MAJOR)%' \ - -e 's%@MOD_MINOR_VERSION@%$(NSS_MINOR)%' \ - -e 's%@MOD_PATCH_VERSION@%$(NSS_PATCH)%' \ - $(SRCDIR)/nss/nss-config.in > $(EXTERNAL_WORKDIR)/config/nss-config \ - && chmod a+x $(EXTERNAL_WORKDIR)/config/nss-config \ ,,nss_configure.log) ifeq ($(OS),WNT) |