This revision was automatically updated to reflect the committed changes.
Closed by commit rS283108: Update crunch bootstrapping test for recent fixes 
(authored by emaste).

CHANGED PRIOR TO COMMIT
  https://reviews.freebsd.org/D2576?vs=5456&id=5476#toc

REPOSITORY
  rS FreeBSD src repository

REVISION DETAIL
  https://reviews.freebsd.org/D2576

AFFECTED FILES
  head/Makefile.inc1

CHANGE DETAILS
  diff --git a/head/Makefile.inc1 b/head/Makefile.inc1
  --- a/head/Makefile.inc1
  +++ b/head/Makefile.inc1
  @@ -1297,7 +1297,9 @@
   _lex=                usr.bin/lex
   .endif
   
  -.if ${BOOTSTRAPPING} < 1001507
  +# r277259 crunchide: Correct 64-bit section header offset
  +# r281674 crunchide: always include both 32- and 64-bit ELF support
  +.if ${BOOTSTRAPPING} < 1100071
   _crunch=     usr.sbin/crunch
   .endif
   
  @@ -1466,11 +1468,6 @@
   _btxld=              usr.sbin/btxld
   .endif
   .endif
  -.if ${TARGET_ARCH} != ${MACHINE_ARCH}
  -.if ${MK_RESCUE} != "no"
  -_crunchide=  usr.sbin/crunch/crunchide
  -.endif
  -.endif
   
   # If we're given an XAS, don't build binutils.
   .if ${XAS:M/*} == ""

EMAIL PREFERENCES
  https://reviews.freebsd.org/settings/panel/emailpreferences/

To: emaste, imp
Cc: freebsd-toolchain
diff --git a/head/Makefile.inc1 b/head/Makefile.inc1
--- a/head/Makefile.inc1
+++ b/head/Makefile.inc1
@@ -1297,7 +1297,9 @@
 _lex=		usr.bin/lex
 .endif
 
-.if ${BOOTSTRAPPING} < 1001507
+# r277259 crunchide: Correct 64-bit section header offset
+# r281674 crunchide: always include both 32- and 64-bit ELF support
+.if ${BOOTSTRAPPING} < 1100071
 _crunch=	usr.sbin/crunch
 .endif
 
@@ -1466,11 +1468,6 @@
 _btxld=		usr.sbin/btxld
 .endif
 .endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
-.if ${MK_RESCUE} != "no"
-_crunchide=	usr.sbin/crunch/crunchide
-.endif
-.endif
 
 # If we're given an XAS, don't build binutils.
 .if ${XAS:M/*} == ""

_______________________________________________
freebsd-toolchain@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-toolchain
To unsubscribe, send any mail to "freebsd-toolchain-unsubscr...@freebsd.org"

Reply via email to