diff options
| author |   Imran Mehmood <imran_mehmood@mentor.com> | 2011-02-16 00:02:09 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2011-02-15 13:10:16 -0800 |
| commit | ff02b94de71ff51f31b1ad9285081798787b0ccb (patch) | |
| tree | 03f8dcc0ac52169d0b1fb53e200906539fc234e4 /conf/bitbake.conf | |
| parent | 648bd1c785fae9de66001dc588720366b9ebda2c (diff) | |
| download | openembedded-ff02b94de71ff51f31b1ad9285081798787b0ccb.tar.gz | |
bitbake.conf: Fix wrong comparison
The expression ('' or 'custom') will always result in 'custom' so the expression will become False when the variable (TARGET_OS, SDK_OS) is '' while its expected to be True in this case also.
Signed-off-by: Imran Mehmood <imran_mehmood@mentor.com>
Acked-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 614909970e..ebaa56d321 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -111,7 +111,7 @@ HOST_EXEEXT = "" TARGET_ARCH ?= "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" -TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" +TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) in ('', 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" TARGET_EXEEXT = "" @@ -119,7 +119,7 @@ TARGET_EXEEXT = "" SDK_ARCH ?= "${BUILD_ARCH}" SDK_OS ?= "${BUILD_OS}" SDK_VENDOR ?= "${BUILD_VENDOR}" -SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) == ('' or 'custom')]}" +SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), ''][bb.data.getVar('SDK_OS', d, 1) in ('', 'custom')]}" SDK_PREFIX = "${SDK_SYS}-" SDK_CC_ARCH ?= "${BUILD_CC_ARCH}" SDK_EXEEXT = "" |