From 9633a0b5ba8e0dfa8182e8996e97ea72fa10740d Mon Sep 17 00:00:00 2001 From: Denis Glotov Date: Thu, 4 Aug 2011 23:44:24 +0400 Subject: [PATCH] Adding USE=clang BUG=chromium-os:16717 TEST=manual yet Change-Id: Ide5074458827f12f7ab35c997beb9d4d0ebba720 Reviewed-on: http://gerrit.chromium.org/gerrit/5324 Reviewed-by: Mike Frysinger Tested-by: Denis Glotov Reviewed-by: Denis Glotov --- .../chromeos-chrome/chromeos-chrome-9999.ebuild | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild index 90f4582..e005e54 100755 --- a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild +++ b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild @@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~arm ~x86" LICENSE="BSD" SLOT="0" -IUSE="+build_tests x86 +gold +chrome_remoting chrome_internal chrome_pdf +chrome_debug -chrome_media -touchui -local_gclient hardfp" +IUSE="-asan +build_tests x86 +gold +chrome_remoting chrome_internal chrome_pdf +chrome_debug -chrome_media -clang -touchui -local_gclient hardfp" # Returns portage version without optional portage suffix. # $1 - Version with optional suffix. @@ -102,7 +102,7 @@ fi # For compilation/local chrome BUILD_TOOL=make -BUILD_DEFINES="sysroot=$ROOT python_ver=2.6 swig_defines=-DOS_CHROMEOS ${USE_TCMALLOC} chromeos=1 linux_sandbox_path=${CHROME_DIR}/chrome-sandbox use_ibus=1 ${EXTRA_BUILD_ARGS}" +BUILD_DEFINES="sysroot=$ROOT python_ver=2.6 swig_defines=-DOS_CHROMEOS chromeos=1 linux_sandbox_path=${CHROME_DIR}/chrome-sandbox use_ibus=1 ${EXTRA_BUILD_ARGS}" BUILDTYPE="${BUILDTYPE:-Release}" BOARD="${BOARD:-${SYSROOT##/build/}}" BUILD_OUT="${BUILD_OUT:-out_${BOARD}}" @@ -222,6 +222,20 @@ set_build_defines() { BUILD_DEFINES="touchui=1 $BUILD_DEFINES" fi + if use clang || use asan; then + if [ "$ARCH" = "x86" ]; then + BUILD_DEFINES="clang=1 werror= $BUILD_DEFINES" + USE_TCMALLOC="linux_use_tcmalloc=0" + if use asan; then + BUILD_DEFINES="asan=1 disable_nacl=1 $BUILD_DEFINES" + fi + else + die Clang is not yet supported for "${ARCH}" + fi + fi + + BUILD_DEFINES="${USE_TCMALLOC} $BUILD_DEFINES" + export GYP_GENERATORS="${BUILD_TOOL}" export GYP_DEFINES="${BUILD_DEFINES}" export builddir_name="${BUILD_OUT}" @@ -559,6 +573,7 @@ src_compile() { append-flags $(test-flags-CC -Wno-error=unused-but-set-variable) emake -r V=1 BUILDTYPE="${BUILDTYPE}" \ + CC.host="$(tc-getCC ${CBUILD})" CXX.host="$(tc-getCXX ${CBUILD})" LINK.host="$(tc-getCXX ${CBUILD})" \ chrome chrome_sandbox libosmesa.so default_extensions \ ${TEST_TARGETS} \ || die "compilation failed" -- 1.7.3.1