diff options
| author | Patrick Mours <pmours@nvidia.com> | 2022-06-30 17:44:38 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2022-06-30 17:49:42 +0300 |
| commit | ef268c78933079137288e326704431432adf9ad9 (patch) | |
| tree | 3f52751f8df6a5bd0fa86d5df75ffd68fd080363 /build_files/build_environment/cmake/ispc.cmake | |
| parent | f00d9e80aec70c804747f9340bdf0e2fc0e94942 (diff) | |
Build: Fix build of library dependencies on Linux aarch64
rBb9c37608a9e959a896f5358d4ab3d3d001a70833 moved evaluation of
`versions.cmake` before `options.cmake`, as a result of which
`BLENDER_PLATFORM_ARM` was no longer defined in `versions.cmake`,
causing it to choose the wrong OpenSSL version for aarch64. This
reverts that. Also fixes a compiler crash when building flex with some
glibc versions.
Differential Revision: https://developer.blender.org/D15319
Diffstat (limited to 'build_files/build_environment/cmake/ispc.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/ispc.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake index 86dc1d9efa8..c2dbedca55f 100644 --- a/build_files/build_environment/cmake/ispc.cmake +++ b/build_files/build_environment/cmake/ispc.cmake @@ -28,7 +28,7 @@ elseif(UNIX) set(ISPC_EXTRA_ARGS_UNIX -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++ - -DARM_ENABLED=Off + -DARM_ENABLED=${BLENDER_PLATFORM_ARM} -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex ) endif() |