Ticket #6389: haiku-clang.patch

build/jam/BuildSetup

@@ -382 +382 @@
         += HAIKU_INCLUDE_PATENTED_CODE=$(HAIKU_INCLUDE_PATENTED_CODE) ;
 }
 
+# common flags for clang compiler
+CLANG_COMMON_FLAGS = -fheinous-gnu-extensions -Wno-unknown-pragmas
+    -Wno-gnu-designator -Wno-mismatched-tags
+    -Wno-unused-variable -Wno-unused-value -Wno-sign-compare
+    -Wno-format-security -Wno-empty-body -Wno-switch-enum
+    -Wno-#warnings -Wno-pointer-sign ;
+CLANG_CFLAGS = $(CLANG_COMMON_FLAGS) -std=gnu89 ; 
+CLANG_C++FLAGS = $(CLANG_COMMON_FLAGS) -std=gnu++98 ; 
+
 # warning flags
 HAIKU_WARNING_CCFLAGS = -Wall -Wno-trigraphs -Wmissing-prototypes
     -Wpointer-arith -Wcast-align -Wsign-compare -Wno-multichar ;
+if $(HAIKU_USE_CLANG) = 1 {
+    HAIKU_WARNING_CCFLAGS += $(CLANG_CFLAGS) ;
+}
 HAIKU_WARNING_C++FLAGS = -Wall -Wno-trigraphs -Wno-ctor-dtor-privacy
     -Woverloaded-virtual -Wpointer-arith -Wcast-align -Wsign-compare
     -Wno-multichar ;
+if $(HAIKU_USE_CLANG) = 1 {
+    HAIKU_WARNING_C++FLAGS += $(CLANG_C++FLAGS) ;
+}
 
 HAIKU_KERNEL_WARNING_CCFLAGS = -Wall -Wno-trigraphs -Wmissing-prototypes
     -Wno-multichar ;
+if $(HAIKU_USE_CLANG) = 1 {
+    HAIKU_KERNEL_WARNING_CCFLAGS += $(CLANG_CFLAGS) ;
+}
 HAIKU_KERNEL_WARNING_C++FLAGS = -Wall -Wno-trigraphs -Wno-multichar ;
+if $(HAIKU_USE_CLANG) = 1 {
+    HAIKU_KERNEL_WARNING_C++FLAGS += $(CLANG_C++FLAGS) ;
+}
 
 # debug flags
 HAIKU_DEBUG_FLAGS ?= -ggdb ;

configure

@@ -82 +82 @@
                               emulation. Warning: Make sure your file system
                               supports sufficient attribute sizes (4 KB per
                               file for all attributes won't suffice).
+  --use-clang
+                              Use clang compiler instead of gcc
 
 environment variables:
   HAIKU_AR                    The static library archiver. Defaults to "ar".
   HAIKU_CC                    The compiler. Defaults to "gcc".
+  HAIKU_GCC                   The gcc compiler. Defaults to "gcc".
   HAIKU_LD                    The linker. Defaults to "ld".
   HAIKU_OBJCOPY               The objcopy to be used. Defaults to "objcopy".
   HAIKU_RANLIB                The static library indexer. Defaults to "ranlib".
@@ -153 +156 @@
     fi
 
     # PLATFORM_LINKLIBS
-    gcclib=`$HAIKU_CC -print-libgcc-file-name`
+    gcclib=`$HAIKU_GCC -print-libgcc-file-name`
     gccdir=`dirname ${gcclib}`
 
-    HAIKU_GCC_RAW_VERSION=`$HAIKU_CC -dumpversion`
-    HAIKU_GCC_MACHINE=`$HAIKU_CC -dumpmachine`
+    HAIKU_GCC_RAW_VERSION=`$HAIKU_GCC -dumpversion`
+    HAIKU_GCC_MACHINE=`$HAIKU_GCC -dumpmachine`
 
     HAIKU_GCC_LIB_DIR=${gccdir}
     HAIKU_GCC_LIBGCC=${gccdir}/libgcc.a
@@ -172 +175 @@
         4.*)
             # for gcc 4 we use the libstdc++ and libsupc++ that come with the
             # compiler
-            HAIKU_STATIC_LIBSTDCXX=`$HAIKU_CC -print-file-name=libstdc++.a`
-            HAIKU_SHARED_LIBSTDCXX=`$HAIKU_CC -print-file-name=libstdc++.so`
-            HAIKU_STATIC_LIBSUPCXX=`$HAIKU_CC -print-file-name=libsupc++.a`
-            HAIKU_SHARED_LIBSUPCXX=`$HAIKU_CC -print-file-name=libsupc++.so`
+            HAIKU_STATIC_LIBSTDCXX=`$HAIKU_GCC -print-file-name=libstdc++.a`
+            HAIKU_SHARED_LIBSTDCXX=`$HAIKU_GCC -print-file-name=libstdc++.so`
+            HAIKU_STATIC_LIBSUPCXX=`$HAIKU_GCC -print-file-name=libsupc++.a`
+            HAIKU_SHARED_LIBSUPCXX=`$HAIKU_GCC -print-file-name=libsupc++.so`
 
             local headers
             if [ -d $gccdir/../../../../$HAIKU_GCC_MACHINE/include/c++/$HAIKU_GCC_RAW_VERSION ]; then
@@ -309 +312 @@
 HAIKU_USE_GCC_PIPE=0
 HAIKU_HOST_USE_32BIT=0
 HAIKU_HOST_USE_XATTR=0
+HAIKU_USE_CLANG=0
 HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR=
 HAIKU_ADD_ALTERNATIVE_GCC_LIBS=0
 HOST_GCC_LD=`gcc -print-prog-name=ld`
@@ -322 +326 @@
 
 set_default_value HAIKU_AR          ar
 set_default_value HAIKU_CC          gcc
+set_default_value HAIKU_GCC         gcc
 set_default_value HAIKU_LD          ld
 set_default_value HAIKU_OBJCOPY     objcopy
 set_default_value HAIKU_RANLIB      ranlib
@@ -421 +426 @@
         --use-gcc-pipe) HAIKU_USE_GCC_PIPE=1; shift 1;;
         --use-32bit)    HAIKU_HOST_USE_32BIT=1; shift 1;;
         --use-xattr)    HAIKU_HOST_USE_XATTR=1; shift 1;;
+        --use-clang)    HAIKU_USE_CLANG=1; HAIKU_CC=clang; shift 1;;
         *)              echo Invalid argument: \`$1\'; exit 1;;
     esac
 done
@@ -546 +552 @@
 HAIKU_USE_GCC_PIPE                  ?= "${HAIKU_USE_GCC_PIPE}" ;
 HAIKU_HOST_USE_32BIT                ?= "${HAIKU_HOST_USE_32BIT}" ;
 HAIKU_HOST_USE_XATTR                ?= "${HAIKU_HOST_USE_XATTR}" ;
+HAIKU_USE_CLANG             ?= "${HAIKU_USE_CLANG}" ;
 HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR    ?= ${HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR} ;
 HAIKU_ADD_ALTERNATIVE_GCC_LIBS      ?= ${HAIKU_ADD_ALTERNATIVE_GCC_LIBS} ;
 
@@ -565 +572 @@
 
 HAIKU_AR                    ?= ${HAIKU_AR} ;
 HAIKU_CC                    ?= ${HAIKU_CC} ;
+HAIKU_GCC                   ?= ${HAIKU_GCC} ;
 HAIKU_LD                    ?= ${HAIKU_LD} ;
 HAIKU_OBJCOPY               ?= ${HAIKU_OBJCOPY} ;
 HAIKU_RANLIB                ?= ${HAIKU_RANLIB} ;