nss: build fails with Win32 make due to backslashes
Change-Id: I9621b3ae12072634a707123ea375f6eb546d9cf9
This commit is contained in:
1
external/nss/UnpackedTarball_nss.mk
vendored
1
external/nss/UnpackedTarball_nss.mk
vendored
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
|
||||
external/nss/nss-3.13.5-zlib-werror.patch \
|
||||
external/nss/nss_macosx.patch \
|
||||
external/nss/nss-linux-x86.patch.0 \
|
||||
external/nss/nss-win32-make.patch.1 \
|
||||
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
|
||||
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
|
||||
external/nss/nss-3.13.3-build.patch.3 \
|
||||
|
20
external/nss/nss-win32-make.patch.1
vendored
Normal file
20
external/nss/nss-win32-make.patch.1
vendored
Normal file
@@ -0,0 +1,20 @@
|
||||
--- nss/nss/coreconf/rules.mk.orig2 2014-06-03 15:30:01.667200000 +0200
|
||||
+++ nss/nss/coreconf/rules.mk 2014-06-03 15:30:14.537200000 +0200
|
||||
@@ -259,7 +259,7 @@
|
||||
@$(MAKE_OBJDIR)
|
||||
rm -f $@
|
||||
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
|
||||
- $(AR) $(subst /,\\,$(OBJS))
|
||||
+ $(AR) $(OBJS)
|
||||
else
|
||||
$(AR) cr $@ $(OBJS)
|
||||
endif
|
||||
@@ -297,7 +297,7 @@
|
||||
ifdef NS_USE_GCC
|
||||
$(LINK_DLL) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)
|
||||
else
|
||||
- $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES))
|
||||
+ $(LINK_DLL) -MAP $(DLLBASE) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)
|
||||
ifdef MT
|
||||
if test -f $@.manifest; then \
|
||||
$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \
|
Reference in New Issue
Block a user