Author: jbeich Date: Sat Mar 30 11:42:16 2013 New Revision: 1223 Log: detect clang in nss better
Reported by: Andreas Nilsson <[email protected]> Added: trunk/security/nss/files/patch-bug856300 - copied, changed from r1221, trunk/security/nss/files/extra-bug835050 Deleted: trunk/security/nss/files/extra-bug835050 Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Fri Mar 29 11:38:56 2013 (r1222) +++ trunk/security/nss/Makefile Sat Mar 30 11:42:16 2013 (r1223) @@ -55,9 +55,6 @@ .if ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/bin -.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 -EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 -.endif .endif check regression-test test: Deleted: trunk/security/nss/files/extra-bug835050 ============================================================================== --- trunk/security/nss/files/extra-bug835050 Sat Mar 30 11:42:16 2013 (r1222) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- lib/freebl/Makefile~ -+++ lib/freebl/Makefile -@@ -659,7 +659,5 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( - # symbolic names to registers, for example, - # .set Htbl, %rdi - # So we can't use Clang's integrated assembler with intel-gcm.s. --ifneq (,$(findstring clang,$(AS))) - $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as - endif --endif Copied and modified: trunk/security/nss/files/patch-bug856300 (from r1221, trunk/security/nss/files/extra-bug835050) ============================================================================== --- trunk/security/nss/files/extra-bug835050 Fri Mar 29 02:27:28 2013 (r1221, copy source) +++ trunk/security/nss/files/patch-bug856300 Sat Mar 30 11:42:16 2013 (r1223) @@ -1,10 +1,11 @@ --- lib/freebl/Makefile~ +++ lib/freebl/Makefile -@@ -659,7 +659,5 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( +@@ -659,7 +659,7 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( # symbolic names to registers, for example, # .set Htbl, %rdi # So we can't use Clang's integrated assembler with intel-gcm.s. -ifneq (,$(findstring clang,$(AS))) ++ifneq (,$(findstring clang,$(shell $(AS) -v 2>&1))) $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as endif --endif + endif _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
