godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

embree: Fix Linux ARM64 build with `-flax-vector-conversions` 

This is a change done upstream in the `devel3` branch for 3.13.6:
82ca6b5ccb

They also seem to define it for macOS, but for us it breaks the build...
¯\_(ツ)_/¯

Also change wrong use of CPPFLAGS (pre-processor) where CXXFLAGS (C++)
makes more sense.
This commit is contained in:
Rémi Verschelde 2022-12-15 13:38:27 +01:00
parent dcb3754db0
commit b5a8055b5c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/raycast/SCsub
View File

@ -68,10 +68,10 @@ if env["builtin_embree"]:
if not env.msvc: if not env.msvc:
if env["arch"] in ["x86_64", "x86_32"]: if env["arch"] in ["x86_64", "x86_32"]:
env_raycast.Append(CPPFLAGS=["-msse2", "-mxsave"]) env_raycast.Append(CCFLAGS=["-msse2", "-mxsave"])
if env["platform"] == "windows": if env["platform"] == "windows":
env_raycast.Append(CPPFLAGS=["-mstackrealign"]) env_raycast.Append(CCFLAGS=["-mstackrealign"])
if env["platform"] == "windows": if env["platform"] == "windows":
if env.msvc: if env.msvc:
@ -92,11 +92,15 @@ if env["builtin_embree"]:
env_thirdparty.Append(CPPDEFINES=["__SSE2__", "__SSE__"]) env_thirdparty.Append(CPPDEFINES=["__SSE2__", "__SSE__"])
if env["platform"] == "web": if env["platform"] == "web":
env_thirdparty.Append(CPPFLAGS=["-msimd128"]) env_thirdparty.Append(CXXFLAGS=["-msimd128"])
if not env.msvc: if not env.msvc:
# Flags synced with upstream gnu.cmake.
if env["arch"] == "arm64" and env["platform"] == "linuxbsd":
env_thirdparty.Append(CXXFLAGS=["-flax-vector-conversions"])
env_thirdparty.Append( env_thirdparty.Append(
CPPFLAGS=[ CXXFLAGS=[
"-fno-strict-overflow", "-fno-strict-overflow",
"-fno-delete-null-pointer-checks", "-fno-delete-null-pointer-checks",
"-fwrapv", "-fwrapv",