summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-04-02 14:21:57 -0700
committerKhem Raj <raj.khem@gmail.com>2020-04-03 07:13:22 -0700
commit826feacfeb64e2b4fe3ff50153a8ba4fa4bfff76 (patch)
tree95568befe1b758b534cbf62b76828c7d7f28f3bf
parentbeb630e255d6a09c5f682853f519172ec9b906d0 (diff)
downloadmeta-clang-826feacfeb64e2b4fe3ff50153a8ba4fa4bfff76.tar.gz
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 <raj.khem@gmail.com>
-rw-r--r--.drone.yml1
-rw-r--r--conf/layer.conf4
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:
40 - echo IMAGE_CLASSES += \"testimage testsdk\" >> conf/local.conf 40 - echo IMAGE_CLASSES += \"testimage testsdk\" >> conf/local.conf
41 - echo INHERIT += \"report-error rm_work blacklist\" >> conf/local.conf 41 - echo INHERIT += \"report-error rm_work blacklist\" >> conf/local.conf
42 - echo TOOLCHAIN = \"clang\" >> conf/local.conf 42 - echo TOOLCHAIN = \"clang\" >> conf/local.conf
43 - echo CLANGSDK = \"1\" >> conf/local.conf
43 - echo IMAGE_INSTALL_append = \" clang \" >> conf/local.conf 44 - echo IMAGE_INSTALL_append = \" clang \" >> conf/local.conf
44 - echo XZ_DEFAULTS = \"--threads=8\" >> conf/local.conf 45 - echo XZ_DEFAULTS = \"--threads=8\" >> conf/local.conf
45 - echo LICENSE_FLAGS_WHITELIST_append = \" commercial non-commercial\" >> conf/local.conf 46 - 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"
26PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang" 26PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang"
27INHERIT += "clang" 27INHERIT += "clang"
28 28
29# include clang in SDK 29# Do not include clang in SDK unless user wants to
30CLANGSDK ??= "1" 30CLANGSDK ??= "0"
31 31
32LLVMVERSION = "10.0.0" 32LLVMVERSION = "10.0.0"
33 33