diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2011-12-15 03:16:45 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2011-12-15 03:16:45 +0000 |
| commit | 44581dd4bbf43375790ebd107a8dbde361b66de6 (patch) | |
| tree | e24e7fa67bf6dab2fba34679cb880894d92f5ba0 /nss/makefile.mk | |
| parent | 519332eab45048a78fef459f1cfd5ef09fb0f42d (diff) | |
moz/nss: missing Linux3.X.mk in security/coreconf
Applied upstream patch.
Vid. https://bugzilla.mozilla.org/show_bug.cgi?id=661609
Diffstat (limited to 'nss/makefile.mk')
| -rw-r--r-- | nss/makefile.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 17a945d16cbc..eb264de2ac00 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -91,6 +91,7 @@ BUILD_ACTION= $(GNUMAKE) nss_build_all #See #i105566# && moz#513024# .IF "$(OS)"=="LINUX" BUILD_ACTION+=FREEBL_NO_DEPEND=1 +PATCH_FILES+=nss_linux.patch .ENDIF .ENDIF # "$(GUI)"=="UNX" @@ -179,15 +180,3 @@ OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk - -# This is a hack to build on a Linux 3.0 system. Between unpacking -# the archive and building it, the existing Linux2.6.mk makefile is -# copied to Linux3.0.mk, which otherwise would be missing and break -# the build. See moz module for a similar hack. -# If someone finds a better solution then please change this. -.IF "$(OS)"=="LINUX" -BUILD_ACTION:= $(COPY) \ - ../../../mozilla/security/coreconf/Linux2.6.mk \ - ../../../mozilla/security/coreconf/Linux3.0.mk \ - && $(BUILD_ACTION) -.ENDIF |