diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-29 01:56:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-29 02:02:06 +0400 |
| commit | f70d9660474c2be5f56d65247df3be5af0479e08 (patch) | |
| tree | 750e3057998085a7342bdf7de95d76c85034c850 /build_files | |
| parent | 52ea13e97087f9a1d604708fe821fcf04d35aba6 (diff) | |
Scons: refactor cycles kernel code to avoid building the AVX kernel with
compilers that don't support it.
CMake still needs to updated to work the same for consistency, but this should
fix the OS X buildbot at least.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-i386.py | 3 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-x86_64.py | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index 1836787d0bd..296b752649d 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -1,7 +1,4 @@ -CC = 'clang' -CXX = 'clang++' - MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 WITH_BF_CYCLES_CUDA_BINARIES = True diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py index 6945b304940..ac923f48abe 100644 --- a/build_files/buildbot/config/user-config-mac-x86_64.py +++ b/build_files/buildbot/config/user-config-mac-x86_64.py @@ -1,7 +1,5 @@ -CC = 'clang' -CXX = 'clang++' - MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64 WITH_BF_CYCLES_CUDA_BINARIES = True + |