1 files changed, 20 insertions, 20 deletions

diff --git a/classes/scan-build.bbclass b/classes/scan-build.bbclass
index 6948bde..4643635 100644
--- a/classes/scan-build.bbclass
+++ b/classes/scan-build.bbclass
@@ -1,10 +1,8 @@
 # Copyright (C) 2018 Khem Raj <raj.khem@gmail.com>
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-CFLAGS =+ "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-CXXFLAGS =+ "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-
-DEPENDS += "clang-native"
+CFLAGS =+ "${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
+CXXFLAGS =+ "${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
 
 #EXTRA_ANALYZER_OPTIONS ?= "-analyze-headers"
 CLANG_SCAN_ENABLED ??= "1"
@@ -13,29 +11,31 @@ CLANG_SCAN_SERVER_IP ??= "10.0.0.10"
 CLANG_SCAN_PORT ??= "8181"
 SCAN_RESULTS_DIR ?= "${TMPDIR}/static-scan/${PN}"
 
-do_configure_prepend() {
-        cc="`echo ${CC} | cut -f1 -d " "`"
-        cxx="`echo ${CXX} | cut -f1 -d " "`"
-        export CC="${cc}"
-        export CXX="${cxx}"
+scanbuild_munge_cc_cxx() {
+        cc="`echo ${CC} | cut -f1 -d " "`"
+        cxx="`echo ${CXX} | cut -f1 -d " "`"
+        export CC="${cc}"
+        export CXX="${cxx}"
 }
 
+do_configure[prefuncs] += "scanbuild_munge_cc_cxx"
+
 do_buildscan() {
-        cc="`echo ${CC} | cut -f1 -d " "`"
-        cxx="`echo ${CXX} | cut -f1 -d " "`"
-#       mk="scan-build --use-cc=${cc} --use-c++=${cxx} --analyzer-target=${HOST_SYS} --html-title="${BP}" -o ${SCAN_RESULTS_DIR} ${EXTRA_ANALYZER_OPTIONS} make"
-#       export MAKE="${mk}"
-        export CC="${cc}"
-        export CXX="${cxx}"
+        cc="`echo ${CC} | cut -f1 -d " "`"
+        cxx="`echo ${CXX} | cut -f1 -d " "`"
+        #mk="scan-build --use-cc=${cc} --use-c++=${cxx} --analyzer-target=${HOST_SYS} --html-title="${BP}" -o ${SCAN_RESULTS_DIR} ${EXTRA_ANALYZER_OPTIONS} make"
+        #export MAKE="${mk}"
+        export CC="${cc}"
+        export CXX="${cxx}"
         scan-build --use-cc=${cc} --use-c++=${cxx} --analyzer-target=${HOST_SYS} --html-title="${BP}" -o ${SCAN_RESULTS_DIR} ${EXTRA_ANALYZER_OPTIONS} ${MAKE} ${EXTRA_OEMAKE} "$@" -C ${S}
 }
 
 do_viewscan() {
-        bbplain "================================================================"
-        bbplain "Stating scan-view server at: http://${CLANG_SCAN_SERVER_IP}:${CLANG_SCAN_PORT}"
-        bbplain "Use Ctrl-C to exit"
-        bbplain "================================================================"
-        scan-view --host ${CLANG_SCAN_SERVER_IP} --port ${CLANG_SCAN_PORT} --allow-all-hosts ${SCAN_RESULTS_DIR}/*/
+        bbplain "================================================================"
+        bbplain "Stating scan-view server at: http://${CLANG_SCAN_SERVER_IP}:${CLANG_SCAN_PORT}"
+        bbplain "Use Ctrl-C to exit"
+        bbplain "================================================================"
+        scan-view --host ${CLANG_SCAN_SERVER_IP} --port ${CLANG_SCAN_PORT} --allow-all-hosts ${SCAN_RESULTS_DIR}/*/
 }
 
 do_viewscan[depends] += "${PN}:do_buildscan"