Skip to content
Snippets Groups Projects
Commit ce5dc02c authored by Campbell Barton's avatar Campbell Barton
Browse files

fix for make stub, readlink was used incorrectly and building didn't work on...

fix for make stub, readlink was used incorrectly and building didn't work on BSD because of CPU detection.
parent 4be95838
No related branches found
No related tags found
No related merge requests found
...@@ -32,7 +32,7 @@ CPU:=$(shell uname -m) ...@@ -32,7 +32,7 @@ CPU:=$(shell uname -m)
# Source and Build DIR's # Source and Build DIR's
BLENDER_DIR:=$(shell readlink $(PWD)) BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS)_$(CPU) BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS)_$(CPU)
...@@ -45,10 +45,10 @@ ifeq ($(OS), Darwin) ...@@ -45,10 +45,10 @@ ifeq ($(OS), Darwin)
NPROCS:=$(shell system_profiler | awk '/Number Of CPUs/{print $4}{next;}') NPROCS:=$(shell system_profiler | awk '/Number Of CPUs/{print $4}{next;}')
endif endif
ifeq ($(OS), FreeBSD) ifeq ($(OS), FreeBSD)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | awk '{print $3}') NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif endif
ifeq ($(OS), NetBSD) ifeq ($(OS), NetBSD)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | awk '{print $3}') NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif endif
...@@ -58,7 +58,7 @@ all: ...@@ -58,7 +58,7 @@ all:
@echo Configuring Blender ... @echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
mkdir --parents $(BUILD_DIR) ; \ mkdir -p $(BUILD_DIR) ; \
cd $(BUILD_DIR) ; \ cd $(BUILD_DIR) ; \
cmake $(BLENDER_DIR) ; \ cmake $(BLENDER_DIR) ; \
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment