From 17061e3aae882fb5ebb73a620fab720100623d10 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 26 Feb 2014 20:44:42 -0500 Subject: lib/buildsystem/*.sh: Fix more [ commands. --- (limited to 'lib/buildsystem') diff --git a/lib/buildsystem/autoconf.sh b/lib/buildsystem/autoconf.sh index a2cbc23..7ec8938 100644 --- a/lib/buildsystem/autoconf.sh +++ b/lib/buildsystem/autoconf.sh @@ -42,7 +42,7 @@ _oh_autoconf_configure() --host=$(oh_buildsystem_arch \ "${OPK_HOST_ARCH}" 'autoconf')" fi - if [ "x${_OH_BUILDSYSTEM_TARGET_ARCH+set}" = 'xset' ]; then + if [ "x${_OH_BUILDSYSTEM_TARGET_ARCH}" != 'x' ]; then arch_opts="${arch_opts} --target=$(oh_buildsystem_arch \ "${_OH_BUILDSYSTEM_TARGET_ARCH}" 'autoconf')" diff --git a/lib/buildsystem/kbuild.sh b/lib/buildsystem/kbuild.sh index e11daf1..5525e86 100644 --- a/lib/buildsystem/kbuild.sh +++ b/lib/buildsystem/kbuild.sh @@ -85,11 +85,11 @@ _oh_kbuild_update_target() mkdir -p "${_OH_BUILDSYSTEM_BUILD_DIR}" cd "${_OH_BUILDSYSTEM_BUILD_DIR}" - if [ "x${_OH_BUILDSYSTEM_BUILD_TARGET+set}" = 'xset' ]; then + if [ "x${_OH_BUILDSYSTEM_BUILD_TARGET}" != 'x' ]; then make ARCH="${arch}" CROSS_COMPILE="${OPK_TOOL_PREFIX}" \ "${@}" "${_OH_BUILDSYSTEM_BUILD_TARGET}" rc=${?} - elif [ "x${target+set}" = 'xset' ]; then + elif [ "x${target}" != 'x' ]; then make ARCH="${arch}" CROSS_COMPILE="${OPK_TOOL_PREFIX}" \ "${@}" "${target}" rc=${?} diff --git a/lib/buildsystem/make.sh b/lib/buildsystem/make.sh index 1eacaee..970b1f5 100644 --- a/lib/buildsystem/make.sh +++ b/lib/buildsystem/make.sh @@ -93,10 +93,10 @@ _oh_make_update_first_defined_target() mkdir -p "${_OH_BUILDSYSTEM_BUILD_DIR}" cd "${_OH_BUILDSYSTEM_BUILD_DIR}" - if [ "x${_OH_BUILDSYSTEM_BUILD_TARGET+set}" = 'xset' ]; then + if [ "x${_OH_BUILDSYSTEM_BUILD_TARGET}" != 'x' ]; then make "${@}" "${_OH_BUILDSYSTEM_BUILD_TARGET}" rc=${?} - elif [ "x${targets+set}" = 'xset' ]; then + elif [ "x${targets}" != 'x' ]; then for target in ${targets}; do # If the target is defined, ... if make -n "${target}" >/dev/null 2>&1; then -- cgit v0.9.1