From 1c8911b1f1475739050236dca4015f60859a16b8 Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Thu, 4 Jan 2018 15:39:53 -0800 Subject: [PATCH] Makefile: no need to calculate GOOS Signed-off-by: Stephen J Day --- Makefile | 4 +--- Makefile.OS | 16 ---------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 Makefile.OS diff --git a/Makefile b/Makefile index 5425e969f..2d08430cb 100644 --- a/Makefile +++ b/Makefile @@ -50,10 +50,8 @@ TESTFLAGS_RACE= GO_GCFLAGS= GO_BUILD_FLAGS= -#Detect the target os -include Makefile.OS #include platform specific makefile -include Makefile.$(target_os) +-include Makefile.$(GOOS) # Add the "incremental" build option `-i` (installs the packages that are # dependencies of the target) to speed up future builds. Only for native builds, diff --git a/Makefile.OS b/Makefile.OS deleted file mode 100644 index 6a5fe010a..000000000 --- a/Makefile.OS +++ /dev/null @@ -1,16 +0,0 @@ -#Detect the OS, and return installos value same as GOOS -target_os = -ifeq ($(OS),Windows_NT) - target_os = windows -else - UNAME_S := $(shell uname -s) - ifeq ($(UNAME_S),Linux) - target_os = linux - endif - ifeq ($(UNAME_S),Darwin) - target_os = darwin - endif - ifeq ($(UNAME_S),FreeBSD) - target_os = freebsd - endif -endif