diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-04-02 14:21:57 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-04-03 07:13:22 -0700 |
| commit | 826feacfeb64e2b4fe3ff50153a8ba4fa4bfff76 (patch) | |
| tree | 95568befe1b758b534cbf62b76828c7d7f28f3bf | |
| parent | beb630e255d6a09c5f682853f519172ec9b906d0 (diff) | |
| download | meta-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.yml | 1 | ||||
| -rw-r--r-- | conf/layer.conf | 4 |
2 files changed, 3 insertions, 2 deletions
| @@ -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" | |||
| 26 | PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang" | 26 | PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang" |
| 27 | INHERIT += "clang" | 27 | INHERIT += "clang" |
| 28 | 28 | ||
| 29 | # include clang in SDK | 29 | # Do not include clang in SDK unless user wants to |
| 30 | CLANGSDK ??= "1" | 30 | CLANGSDK ??= "0" |
| 31 | 31 | ||
| 32 | LLVMVERSION = "10.0.0" | 32 | LLVMVERSION = "10.0.0" |
| 33 | 33 | ||
