[Bf-blender-cvs] [ade4017293e] master: GNUmakefile: fix deps directory

Luca Rood noreply at git.blender.org
Sat Feb 9 07:02:03 CET 2019


Commit: ade4017293ecf191a87ef5ea2a3f75b41da1b3d2
Author: Luca Rood
Date:   Sat Feb 9 16:58:52 2019 +1100
Branches: master
https://developer.blender.org/rBade4017293ecf191a87ef5ea2a3f75b41da1b3d2

GNUmakefile: fix deps directory

`uname -p` is unknown on some distros, use posix standard `uname -m`.

===================================================================

M	GNUmakefile

===================================================================

diff --git a/GNUmakefile b/GNUmakefile
index 21183220b80..c8e7e5a7d20 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -28,7 +28,7 @@
 # System Vars
 OS:=$(shell uname -s)
 OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]')
-# CPU:=$(shell uname -m)  # UNUSED
+CPU:=$(shell uname -m)
 
 
 # Source and Build DIR's
@@ -55,7 +55,7 @@ ifndef DEPS_INSTALL_DIR
 
 	ifneq ($(OS_NCASE),darwin)
 		# Add processor type to directory name
-		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p)
+		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU)
 	endif
 endif



More information about the Bf-blender-cvs mailing list