From 826feacfeb64e2b4fe3ff50153a8ba4fa4bfff76 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 2 Apr 2020 14:21:57 -0700 Subject: layer.conf: Mark CLANGSDK 0 by default This ensures that clangsdk does not inserts itself unless user asks for Fixes #234 Signed-off-by: Khem Raj --- .drone.yml | 1 + conf/layer.conf | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 548873f..7f14e38 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,6 +40,7 @@ steps: - echo IMAGE_CLASSES += \"testimage testsdk\" >> conf/local.conf - echo INHERIT += \"report-error rm_work blacklist\" >> conf/local.conf - echo TOOLCHAIN = \"clang\" >> conf/local.conf + - echo CLANGSDK = \"1\" >> conf/local.conf - echo IMAGE_INSTALL_append = \" clang \" >> conf/local.conf - echo XZ_DEFAULTS = \"--threads=8\" >> conf/local.conf - echo LICENSE_FLAGS_WHITELIST_append = \" commercial non-commercial\" >> conf/local.conf diff --git a/conf/layer.conf b/conf/layer.conf index f3e3fcc..792ba40 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -26,8 +26,8 @@ PREFERRED_PROVIDER_llvm-native = "clang-native" PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang" INHERIT += "clang" -# include clang in SDK -CLANGSDK ??= "1" +# Do not include clang in SDK unless user wants to +CLANGSDK ??= "0" LLVMVERSION = "10.0.0" -- cgit v1.2.3-54-g00ecf