Latest IFC requires clang40 to build bootable system

[nomadlogic]

Hey there - I've recently attempted to update my system against 92f1aeaa3edba87c8665173b99eedfc138c8c734 which resulted in the bsd loading failing to load my kernel. I believe the fix is to install llvm40 and apply the following patch:

diff --git a/Makefile.inc1 b/Makefile.inc1
index 365dba92137..e1d0ce72529 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -54,25 +54,25 @@ SRCDIR?=    ${.CURDIR}
 LOCALBASE?=    /usr/local

 .if !defined(XCC)
-.if !exists(${LOCALBASE}/bin/clang39)
-.error "You need to install devel/llvm39 to build or set XCC"
+.if !exists(${LOCALBASE}/bin/clang40)
+.error "You need to install devel/llvm40 to build or set XCC"
 .endif

-XCC= ${LOCALBASE}/bin/clang39
+XCC= ${LOCALBASE}/bin/clang40
 .endif
 .if !defined(XCXX)
-.if !exists(${LOCALBASE}/bin/clang++39)
-.error "You need to install devel/llvm39 to build or set XCXX"
+.if !exists(${LOCALBASE}/bin/clang++40)
+.error "You need to install devel/llvm40 to build or set XCXX"
 .endif

-XCXX= ${LOCALBASE}/bin/clang++39
+XCXX= ${LOCALBASE}/bin/clang++40
 .endif
 .if !defined(XCPP)                                                                               
-.if !exists(${LOCALBASE}/bin/clang-cpp39)                                                        
-.error "You need to install devel/llvm39 to build or set XCPP"                                   
+.if !exists(${LOCALBASE}/bin/clang-cpp40)                                                        
+.error "You need to install devel/llvm40 to build or set XCPP"                                   
 .endif                                                                                           

-XCPP= ${LOCALBASE}/bin/clang-cpp39                                                               
+XCPP= ${LOCALBASE}/bin/clang-cpp40                                                               
 .endif   

After doing this on my local VM I am able to build/install the latest code and can successfully boot the system. Without this patch my system is unbootable and I have to re-install from scratch.

[mattmacy]

Thanks. Do you have commit privs?

[nomadlogic]

Looks like I do - just pushed 7e02ee4a000a704b95b09f768c11f08fb5a72dab to drm-next.