diff options
| author | David Tardon <dtardon@redhat.com> | 2013-03-27 10:45:46 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-03-27 17:08:09 +0100 |
| commit | ede96bce22d7394f14cd9d5674e8a5cc63e5c473 (patch) | |
| tree | 3cf431df9d126dc822cad00cd795a3f7347703e2 /nss | |
| parent | 3a7d870d721d39c239ccc9d7873f34e04c7914d3 (diff) | |
fix mingw build of nss
Change-Id: I61ae51ef53321ed507dfc2974dc5bbfb72d3505e
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/ExternalProject_nss.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index 6e9b36349a0b..e37b6ba0f852 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -52,14 +52,18 @@ $(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_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)" \ - OS_LIBS="-ladvapi32 -lws2_32 -lmwsock -lwinm $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \ - 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="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py" \ $(MAKE) -j1 nss_build_all \ + NS_USE_GCC=1 \ + CC="$(CC) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + CXX="$(CXX) $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + OS_LIBS="-ladvapi32 -lws2_32 -lmswsock -lwinmm $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED_LIBSTDCPP))" \ + LDFLAGS="" \ + PATH="$(PATH)" \ + RANLIB="$(RANLIB)" \ + 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="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py" \ ,mozilla/security/nss) endif |