equal
deleted
inserted
replaced
70 OS_ARCH := $(shell $(UNAME) -p) |
70 OS_ARCH := $(shell $(UNAME) -p) |
71 OS_VERSION := $(shell $(UNAME) -r) |
71 OS_VERSION := $(shell $(UNAME) -r) |
72 endif |
72 endif |
73 ifeq ($(UNAME_S), Linux) |
73 ifeq ($(UNAME_S), Linux) |
74 OS_NAME = linux |
74 OS_NAME = linux |
|
75 OS_ARCH := $(shell $(UNAME) -m) |
|
76 # Check for unknown arch, try uname -p if uname -m says unknown |
|
77 ifeq ($(OS_ARCH),unknown) |
|
78 OS_ARCH := $(shell $(UNAME) -p) |
|
79 endif |
|
80 OS_VERSION := $(shell $(UNAME) -r) |
|
81 endif |
|
82 ifeq ($(UNAME_S), Darwin) |
|
83 OS_NAME = macosx |
75 OS_ARCH := $(shell $(UNAME) -m) |
84 OS_ARCH := $(shell $(UNAME) -m) |
76 # Check for unknown arch, try uname -p if uname -m says unknown |
85 # Check for unknown arch, try uname -p if uname -m says unknown |
77 ifeq ($(OS_ARCH),unknown) |
86 ifeq ($(OS_ARCH),unknown) |
78 OS_ARCH := $(shell $(UNAME) -p) |
87 OS_ARCH := $(shell $(UNAME) -p) |
79 endif |
88 endif |