Changed architecture detection for linux and macos

2026-04-07 13:55:33 +08:00 · 2016-12-01 18:00:15 +03:00
1 changed files with 9 additions and 7 deletions
--- a/16
+++ b/16
@ -13,27 +13,29 @@ ifeq ($(OS),Windows_NT)
 	endif
 else
 	UNAME_S := $(shell uname -s)
+	UNAME_P := $(shell uname -p)
 	ifeq ($(UNAME_S),Linux)
 		PLATFORM := linux
 		SHARED_EXT := .so*
 		SHELL_EXT := .sh
 		LIB_EXT := .a
 		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
 	ifeq ($(UNAME_S),Darwin)
 		PLATFORM := mac
+		ARCHITECTURE := 64
 		SHARED_EXT := .dylib*
 		SHELL_EXT := .sh
 		LIB_EXT := .a
 		MAKE := make -j $(shell sysctl -n hw.ncpu)
 	endif
-	UNAME_P := $(shell uname -p)
-	ifeq ($(UNAME_P),x86_64)
-		ARCHITECTURE := 64
-	endif
-	ifneq ($(filter %86,$(UNAME_P)),)
-		ARCHITECTURE := 32
-	endif
 endif

 TARGET := $(PLATFORM)_$(ARCHITECTURE)