Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix CMake issues on OpenHarmony (#34062)

Browse source 
- We should use the CMake version from the NDK
- ignore errors from unused commandline parameters,
  which can easily happen due to --gcc-toolchain, which is added by the
  default CMake code when compiling with Clang.
 - Previously servo didn't have any CMake dependency projects anymore,
   so these issues didn't surface.

Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>
This commit is contained in:
Jonathan Schwender 2024-10-30 05:40:59 +01:00 • committed by GitHub
parent 7fa548f555
commit bac1101163
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/platform/build_target.py
View file

@ -343,7 +343,8 @@ class OpenHarmonyTarget(CrossBuildTarget):
env['HOST_CFLAGS'] = ''
env['HOST_CXXFLAGS'] = ''
ohos_cflags = ['-D__MUSL__', f' --target={clang_target_triple}', f' --sysroot={ohos_sysroot}']
ohos_cflags = ['-D__MUSL__', f' --target={clang_target_triple}', f' --sysroot={ohos_sysroot}',
"-Wno-error=unused-command-line-argument"]
if clang_target_triple.startswith('armv7-'):
ohos_cflags.extend(['-march=armv7-a', '-mfloat-abi=softfp', '-mtune=generic-armv7-a', '-mthumb'])
ohos_cflags_str = " ".join(ohos_cflags)
@ -352,6 +353,7 @@ class OpenHarmonyTarget(CrossBuildTarget):
env['TARGET_CXXFLAGS'] = ohos_cflags_str
# CMake related flags
env['CMAKE'] = ndk_root.joinpath("build-tools", "cmake", "bin", "cmake")
cmake_toolchain_file = ndk_root.joinpath("build", "cmake", "ohos.toolchain.cmake")
if cmake_toolchain_file.is_file():
env[f'CMAKE_TOOLCHAIN_FILE_{rust_target_triple}'] = str(cmake_toolchain_file)