svn commit: r333017 - head

Ed Maste emaste at FreeBSD.org
Thu Apr 26 13:18:25 UTC 2018


Author: emaste
Date: Thu Apr 26 13:18:24 2018
New Revision: 333017
URL: https://svnweb.freebsd.org/changeset/base/333017

Log:
  Correct r307825 BOOTSTRAPPING test for unsupported upgrade
  
  __FreeBSD_version has five digits after the major number, but the min
  versions in the test had an extra 0 (so the test was always false).

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Apr 26 12:23:31 2018	(r333016)
+++ head/Makefile.inc1	Thu Apr 26 13:18:24 2018	(r333017)
@@ -1851,9 +1851,9 @@ legacy: .PHONY
 # the version bump in r296219 (from July 29, 2015 -> Feb 29, 2016).
 .if ${BOOTSTRAPPING} != 0 && \
 	${WANT_COMPILER_TYPE} == "clang" && ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30601
-.if   ${BOOTSTRAPPING} > 10000000 && ${BOOTSTRAPPING} < 1002501
+.if   ${BOOTSTRAPPING} > 1000000 && ${BOOTSTRAPPING} < 1002501
 	@echo "ERROR: Source upgrades from stable/10 prior to r286033 are not supported."; false
-.elif ${BOOTSTRAPPING} >  9000000 && ${BOOTSTRAPPING} <  903509
+.elif ${BOOTSTRAPPING} >  900000 && ${BOOTSTRAPPING} <  903509
 	@echo "ERROR: Source upgrades from stable/9 prior to r286035 are not supported."; false
 .endif
 .endif


More information about the svn-src-all mailing list