Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

android/ohos: Respect user provided TARGET_CFLAGS (#37563)

Browse source 
Preserve user set TARGET_CFLAGS and co.
This allows users to pass additional CFLAGS, when compiling code for the
target, e.g. to optimize for a specific CPU.

Testing: The default behavior if the environment variables are not set
is unchanged and covered by existing CI tests.

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2025-06-19 18:15:57 +02:00 • committed by GitHub
parent 7d2c9ec19c
commit a0fafac29c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -247,8 +247,8 @@ class AndroidTarget(CrossBuildTarget):
# #
# Also worth remembering: autoconf uses C for its configuration, # Also worth remembering: autoconf uses C for its configuration,
# even for C++ builds, so the C flags need to line up with the C++ flags. # even for C++ builds, so the C flags need to line up with the C++ flags.
env["TARGET_CFLAGS"] = "--target=" + android_toolchain_name env["TARGET_CFLAGS"] = env.get("TARGET_CFLAGS", "") + " " + "--target=" + android_toolchain_name
env["TARGET_CXXFLAGS"] = "--target=" + android_toolchain_name env["TARGET_CXXFLAGS"] = env.get("TARGET_CXXFLAGS", "") + " " + "--target=" + android_toolchain_name
# These two variables are needed for the mozjs compilation. # These two variables are needed for the mozjs compilation.
env["ANDROID_API_LEVEL"] = android_api env["ANDROID_API_LEVEL"] = android_api
@ -388,9 +388,10 @@ class OpenHarmonyTarget(CrossBuildTarget):
if clang_target_triple.startswith("armv7-"): if clang_target_triple.startswith("armv7-"):
ohos_cflags.extend(["-march=armv7-a", "-mfloat-abi=softfp", "-mtune=generic-armv7-a", "-mthumb"]) ohos_cflags.extend(["-march=armv7-a", "-mfloat-abi=softfp", "-mtune=generic-armv7-a", "-mthumb"])
ohos_cflags_str = " ".join(ohos_cflags) ohos_cflags_str = " ".join(ohos_cflags)
env["TARGET_CFLAGS"] = ohos_cflags_str
env["TARGET_CPPFLAGS"] = "-D__MUSL__" env["TARGET_CFLAGS"] = env.get("TARGET_CFLAGS", "") + " " + ohos_cflags_str
env["TARGET_CXXFLAGS"] = ohos_cflags_str env["TARGET_CPPFLAGS"] = env.get("TARGET_CPPFLAGS", "") + " " + "-D__MUSL__"
env["TARGET_CXXFLAGS"] = env.get("TARGET_CXXFLAGS", "") + " " + ohos_cflags_str
# CMake related flags # CMake related flags
env["CMAKE"] = ndk_root.joinpath("build-tools", "cmake", "bin", "cmake").as_posix() env["CMAKE"] = ndk_root.joinpath("build-tools", "cmake", "bin", "cmake").as_posix()