github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1964 from stevvooe/remove-silly-makefile-stuff

Browse Source 
Makefile: no need to calculate GOOS
This commit is contained in:
Phil Estes 2018-01-05 10:41:38 -05:00 committed by GitHub
commit 8b6909f22f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -50,10 +50,8 @@ TESTFLAGS_RACE=
GO_GCFLAGS= GO_GCFLAGS=
GO_BUILD_FLAGS= GO_BUILD_FLAGS=
#Detect the target os
include Makefile.OS
#include platform specific makefile #include platform specific makefile
include Makefile.$(target_os) -include Makefile.$(GOOS)
# Add the "incremental" build option `-i` (installs the packages that are # Add the "incremental" build option `-i` (installs the packages that are
# dependencies of the target) to speed up future builds. Only for native builds, # dependencies of the target) to speed up future builds. Only for native builds,

16
Makefile.OS
View File

@ -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