Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-04-29 22:38:18 +0300
committerBastien Montagne <bastien@blender.org>2020-04-29 22:38:18 +0300
commit00e0034b13e6a8d88fbdb1a6b2b86d99a9b5a69b (patch)
tree4292f9c8792acdf54307a6a00562930f2cba4705 /build_files
parentd07dab0d612614998a40e543a19b1f755a8f12a4 (diff)
parentcd833d887995d210b5998bd7d17c59cbb8fe0cba (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/cmake/bzip2.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/bzip2.cmake b/build_files/build_environment/cmake/bzip2.cmake
index fbf5551e719..bb2be7c634a 100644
--- a/build_files/build_environment/cmake/bzip2.cmake
+++ b/build_files/build_environment/cmake/bzip2.cmake
@@ -25,6 +25,8 @@ if(UNIX AND NOT APPLE)
set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
&& export PREFIX=${BZIP2_PREFIX})
+else()
+ set(BZIP2_CONFIGURE_ENV ${CONFIGURE_ENV})
endif()
ExternalProject_Add(external_bzip2