Commit 82e82971 authored by Alexey Golubev's avatar Alexey Golubev Committed by GitHub

Changed architecture detection for linux and macos

parent 4b8c2b4f
...@@ -13,27 +13,29 @@ ifeq ($(OS),Windows_NT) ...@@ -13,27 +13,29 @@ ifeq ($(OS),Windows_NT)
endif endif
else else
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
UNAME_P := $(shell uname -p)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
PLATFORM := linux PLATFORM := linux
SHARED_EXT := .so* SHARED_EXT := .so*
SHELL_EXT := .sh SHELL_EXT := .sh
LIB_EXT := .a LIB_EXT := .a
MAKE := make -j $(shell grep -c ^processor /proc/cpuinfo) MAKE := make -j $(shell grep -c ^processor /proc/cpuinfo)
ifeq ($(UNAME_P),x86_64)
ARCHITECTURE := 64
endif
ifneq ($(filter %86,$(UNAME_P)),)
ARCHITECTURE := 32
endif
endif endif
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
PLATFORM := mac PLATFORM := mac
ARCHITECTURE := 64
SHARED_EXT := .dylib* SHARED_EXT := .dylib*
SHELL_EXT := .sh SHELL_EXT := .sh
LIB_EXT := .a LIB_EXT := .a
MAKE := make -j $(shell sysctl -n hw.ncpu) MAKE := make -j $(shell sysctl -n hw.ncpu)
endif endif
UNAME_P := $(shell uname -p)
ifeq ($(UNAME_P),x86_64)
ARCHITECTURE := 64
endif
ifneq ($(filter %86,$(UNAME_P)),)
ARCHITECTURE := 32
endif
endif endif
TARGET := $(PLATFORM)_$(ARCHITECTURE) TARGET := $(PLATFORM)_$(ARCHITECTURE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment