From 45c8eafd42fb6f73adf7693a140b474fc492810a Mon Sep 17 00:00:00 2001
From: Francisco Molina <femolina@uc.cl>
Date: Fri, 18 Oct 2019 08:07:37 +0200
Subject: [PATCH] Makefile.include: remove repeated OS declaration

---
 Makefile.include               |  2 +-
 boards/native/Makefile.dep     |  1 -
 boards/native/Makefile.include | 12 ------------
 cpu/native/Makefile            |  1 -
 pkg/fatfs/Makefile.include     |  1 -
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index 7a61f22f0c..12feb826d0 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -105,7 +105,7 @@ include $(RIOTMAKE)/utils/strings.mk
 
 
 # UNAME is always needed so use simple variable expansion so only evaluated once
-UNAME := $(OS -m)
+UNAME := $(shell uname -m -s)
 OS = $(word 1, $(UNAME))
 OS_ARCH = $(word 2, $(UNAME))
 
diff --git a/boards/native/Makefile.dep b/boards/native/Makefile.dep
index 72fdb74096..fb4182b31a 100644
--- a/boards/native/Makefile.dep
+++ b/boards/native/Makefile.dep
@@ -6,7 +6,6 @@ ifneq (,$(filter mtd,$(USEMODULE)))
   USEMODULE += mtd_native
 endif
 
-OS := $(shell uname -s)
 ifneq (,$(filter can,$(USEMODULE)))
   ifeq ($(OS),Linux)
     USEMODULE += can_linux
diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
index 220d930943..213c3f6e53 100644
--- a/boards/native/Makefile.include
+++ b/boards/native/Makefile.include
@@ -5,8 +5,6 @@ export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/
 
 USEMODULE += native-drivers
 
-OS := $(shell uname -s)
-
 ifeq ($(OS),Darwin)
   DEBUGGER ?= lldb
 else
@@ -29,21 +27,17 @@ ifeq (,$(filter -std=%, $(CFLAGS)))
   CFLAGS += -std=gnu99
 endif
 
-OS_ARCH := $(shell uname -m)
 ifeq ($(OS_ARCH),x86_64)
   CFLAGS += -m32
 endif
 ifneq (,$(filter -DDEVELHELP,$(CFLAGS)))
   CFLAGS += -fstack-protector-all
 endif
-OS := $(shell uname -s)
 ifeq ($(OS),FreeBSD)
-  OS_ARCH := $(shell uname -m)
   ifeq ($(OS_ARCH),amd64)
     CFLAGS += -m32 -DCOMPAT_32BIT -B/usr/lib32
   endif
 endif
-OS := $(shell uname -s)
 ifeq ($(OS),Darwin)
   CFLAGS += -Wno-deprecated-declarations
 endif
@@ -52,13 +46,10 @@ endif
 CXXUWFLAGS +=
 CXXEXFLAGS +=
 
-OS_ARCH := $(shell uname -m)
 ifeq ($(OS_ARCH),x86_64)
   export LINKFLAGS += -m32
 endif
-OS := $(shell uname -s)
 ifeq ($(OS),FreeBSD)
-  OS_ARCH := $(shell uname -m)
   ifeq ($(OS_ARCH),amd64)
     export LINKFLAGS += -m32 -DCOMPAT_32BIT -L/usr/lib32 -B/usr/lib32
   endif
@@ -69,7 +60,6 @@ endif
 
 # clean up unused functions
 CFLAGS += -ffunction-sections -fdata-sections
-OS := $(shell uname -m)
 ifeq ($(OS),Darwin)
   export LINKFLAGS += -Wl,-dead_strip
 else
@@ -123,7 +113,6 @@ endif
 
 # backward compatability with glibc <= 2.17 for native
 ifeq ($(CPU),native)
-  OS := $(shell uname -s)
   ifeq ($(OS),Linux)
     ifeq ($(shell ldd --version |  awk '/^ldd/{if ($$NF < 2.17) {print "yes"} else {print "no"} }'),yes)
 	  LINKFLAGS += -lrt
@@ -134,7 +123,6 @@ endif
 # clumsy way to enable building native on osx:
 BUILDOSXNATIVE = 0
 ifeq ($(CPU),native)
- OS := $(shell uname -s)
   ifeq ($(OS),Darwin)
     BUILDOSXNATIVE = 1
   endif
diff --git a/cpu/native/Makefile b/cpu/native/Makefile
index 7d3fd6190c..cc0605cc5f 100644
--- a/cpu/native/Makefile
+++ b/cpu/native/Makefile
@@ -3,7 +3,6 @@ MODULE = cpu
 DIRS += periph
 DIRS += vfs
 
-OS := $(shell uname -s)
 ifeq ($(OS),Darwin)
   CFLAGS += -D_XOPEN_SOURCE=600 -D_DARWIN_C_SOURCE
 endif
diff --git a/pkg/fatfs/Makefile.include b/pkg/fatfs/Makefile.include
index 56a6daf0a1..a59773a8d4 100644
--- a/pkg/fatfs/Makefile.include
+++ b/pkg/fatfs/Makefile.include
@@ -16,7 +16,6 @@ else
   CFLAGS += -DFATFS_FFCONF_OPT_FS_NORTC=1
 endif
 
-OS := $(shell uname -s)
 ifeq ($(OS),Darwin)
   CFLAGS += -Wno-empty-body
 endif