You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2020/01/29 08:26:19 UTC
[incubator-nuttx] 11/12: Revert "Use "uname -s" where "uname -o" is
not available"
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch revert-179-osx-sim
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 93e5fa4a0991698bbe26ccbbb5699a2b458d9ffd
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Wed Jan 29 09:26:02 2020 +0100
Revert "Use "uname -s" where "uname -o" is not available"
This reverts commit aa8aadf18e8bc2cd45233b662fe83512a5e0bd5c.
---
boards/sim/sim/sim/configs/cxxtest/Make.defs | 2 +-
boards/sim/sim/sim/configs/nsh2/Make.defs | 2 +-
boards/sim/sim/sim/scripts/Make.defs | 2 +-
boards/x86/qemu/qemu-i486/scripts/Make.defs | 2 +-
tools/Makefile.host | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/boards/sim/sim/sim/configs/cxxtest/Make.defs b/boards/sim/sim/sim/configs/cxxtest/Make.defs
index ef5fcad..7146e1a 100644
--- a/boards/sim/sim/sim/configs/cxxtest/Make.defs
+++ b/boards/sim/sim/sim/configs/cxxtest/Make.defs
@@ -36,7 +36,7 @@
include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
-HOSTOS = ${shell uname -o 2>/dev/null || uname -s 2>/dev/null || echo "Other"}
+HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
ARCHOPTIMIZATION = -g
diff --git a/boards/sim/sim/sim/configs/nsh2/Make.defs b/boards/sim/sim/sim/configs/nsh2/Make.defs
index 1fefa4d..e329be3 100644
--- a/boards/sim/sim/sim/configs/nsh2/Make.defs
+++ b/boards/sim/sim/sim/configs/nsh2/Make.defs
@@ -36,7 +36,7 @@
include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
-HOSTOS = ${shell uname -o 2>/dev/null || uname -s 2>/dev/null || echo "Other"}
+HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
ARCHOPTIMIZATION = -g
diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs
index 4558350..94d53bb 100644
--- a/boards/sim/sim/sim/scripts/Make.defs
+++ b/boards/sim/sim/sim/scripts/Make.defs
@@ -37,7 +37,7 @@
include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
-HOSTOS = ${shell uname -o 2>/dev/null || uname -s 2>/dev/null || echo "Other"}
+HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}
ifeq ($(CONFIG_WINDOWS_MSYS),y)
DIRLINK = $(TOPDIR)/tools/copydir.sh
diff --git a/boards/x86/qemu/qemu-i486/scripts/Make.defs b/boards/x86/qemu/qemu-i486/scripts/Make.defs
index df4c879..e153be8 100644
--- a/boards/x86/qemu/qemu-i486/scripts/Make.defs
+++ b/boards/x86/qemu/qemu-i486/scripts/Make.defs
@@ -36,7 +36,7 @@
include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
-HOSTOS = ${shell uname -o 2>/dev/null || uname -s 2>/dev/null || echo "Other"}
+HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
ARCHOPTIMIZATION = -g
diff --git a/tools/Makefile.host b/tools/Makefile.host
index 71e87e5..07ebe9e 100644
--- a/tools/Makefile.host
+++ b/tools/Makefile.host
@@ -43,7 +43,7 @@ include ${TOPDIR}/tools/Config.mk
# Define HOSTCC on the make command line if it differs from these defaults
# Define HOSTCFLAGS with -g on the make command line to build debug versions
-HOSTOS = ${shell uname -o 2>/dev/null || uname -s 2>/dev/null || echo "Other"}
+HOSTOS = ${shell uname -o || echo "Other"}
ifeq ($(HOSTOS),MinGW)