Skip to content

Commit 67facf6

Browse files
committed
macOS: fixed compilation of all code for arm64
1 parent e8bb041 commit 67facf6

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

build_all.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ def run_per_platform(cmds_windows=[], cmds_macOS=[], cmds_linux=[], cwd='.'):
111111
print('echo failed to build CDK, stop!')
112112
exit(1)
113113
elif DAGOR_HOST == 'macOS':
114-
run('./build_dagor_cdk_mini_macOS.sh', cwd=proj_dir)
114+
BUILD_TOOLS_CMD = './build_dagor_cdk_mini_macOS.sh'
115+
if BUILD_TARGET_ARCH != '':
116+
BUILD_TOOLS_CMD += ' ' + BUILD_TARGET_ARCH
117+
run(BUILD_TOOLS_CMD, cwd=proj_dir)
115118
elif DAGOR_HOST == 'linux':
116119
run('./build_dagor_cdk_mini_linux.sh', cwd=proj_dir)
117120

prog/3rdPartyLibs/phys/bullet-3/jamfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if $(Platform) = linux || $(PlatformSpec) in clang clang64 {
6060
if $(PlatformArch) != arm64 { CPPopt += /clang:-fno-unsafe-math-optimizations /clang:-mno-fma ; }
6161
} else {
6262
CPPopt += -ffast-math ;
63-
if ! $(Platform) in iOS nswitch android { CPPopt += -fno-unsafe-math-optimizations -mno-fma ; }
63+
if $(PlatformArch) in x86 x86_64 { CPPopt += -fno-unsafe-math-optimizations -mno-fma ; }
6464
}
6565
}
6666
if $(PlatformSpec) in clang {

0 commit comments

Comments
 (0)