Skip to content

Commit

Permalink
Remove defunct HARFBUZZ_SYS_NO_PKG_CONFIG env var
Browse files Browse the repository at this point in the history
  • Loading branch information
Nopey committed Apr 29, 2024
1 parent 4c9e3f9 commit b242c80
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions python/servo/command_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,6 @@ def build_env(self):
if platform.is_macos:
util.prepend_paths_to_env(env, "DYLD_LIBRARY_PATH", os.path.join(gstreamer_root, "lib"))

effective_target = self.cross_compile_target or servo.platform.host_triple()
if "msvc" in effective_target:
# Always build harfbuzz from source
env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true"

if sys.platform != "win32":
env.setdefault("CC", "clang")
env.setdefault("CXX", "clang++")
Expand Down Expand Up @@ -615,7 +610,6 @@ def to_ndk_bin(prog):
env['OBJCOPY'] = to_ndk_bin("llvm-objcopy")
env['YASM'] = to_ndk_bin("yasm")
env['STRIP'] = to_ndk_bin("llvm-strip")
env['HARFBUZZ_SYS_NO_PKG_CONFIG'] = "true"
env['RUST_FONTCONFIG_DLOPEN'] = "on"

env["LIBCLANG_PATH"] = path.join(llvm_toolchain, "lib64")
Expand Down

0 comments on commit b242c80

Please sign in to comment.