mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 16:40:31 -04:00
8a70fa9357
- update to 0.8.2 - DESKTOP_ENTRIES instead of desktop file - USES+=gnome gl - patched build to detect clang instead of setting clang, should fix build on gcc architectures (powerpc64) PR: 234277 Submitted by: Greg V (maintainer)
35 lines
1.2 KiB
Text
35 lines
1.2 KiB
Text
--- SConstruct.orig 2018-12-22 14:00:12 UTC
|
|
+++ SConstruct
|
|
@@ -28,15 +28,18 @@ clang = int(ARGUMENTS.get("clang", 0))
|
|
cycles = int(ARGUMENTS.get('cycles', 1))
|
|
sound = False
|
|
|
|
-if os.environ.get('CC') == 'clang': clang = 1
|
|
+import subprocess
|
|
+if 'clang' in subprocess.check_output([os.environ.get('CC', 'cc'), '-v'],
|
|
+ stderr=subprocess.STDOUT):
|
|
+ clang = 1
|
|
+print 'clang', clang
|
|
if profile: debug = 0
|
|
|
|
-env = Environment(ENV = os.environ)
|
|
+
|
|
+env = Environment(ENV = os.environ, CC = os.environ.get('CC', 'cc'),
|
|
+ CXX = os.environ.get('CXX', 'c++'))
|
|
conf = env.Configure()
|
|
|
|
-if clang:
|
|
- env.Replace(CC='clang', CXX='clang++')
|
|
-
|
|
# Asan & Ubsan (need to come first).
|
|
# Cycles doesn't like libasan with clang, so we only use it on
|
|
# C code with clang.
|
|
@@ -145,7 +148,7 @@ if cycles:
|
|
sources += glob.glob('ext_src/cycles/src/subd/*.cpp')
|
|
|
|
env.Append(CPPPATH=['ext_src/cycles/src'])
|
|
- env.Append(CPPPATH=['ext_src/cycles/third_party/atomic'])
|
|
+ env.Prepend(CPPPATH=['ext_src/cycles/third_party/atomic'])
|
|
env.Append(CPPFLAGS=[
|
|
'-DCYCLES_STD_UNORDERED_MAP',
|
|
'-DCCL_NAMESPACE_BEGIN=namespace ccl {',
|