Skip to content

Commit dff3336

Browse files
authored
Use a clean environment when building harfbuzz (#13995)
Prevent CMake from picking up the parent project CFLAGS. Fixes: emscripten-core/emsdk#796
1 parent 4e35687 commit dff3336

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,3 +558,4 @@ a license to everyone to use it as detailed in LICENSE.)
558558
* Rafael Brune <mail@rbrune.de>
559559
* Aleksi Sapon <aleksi.sapon@faro.com> (copyright owned by FARO Technologies, Inc.)
560560
* Radek Doulik <radek.doulik@gmail.com> (copyright owned by Microsoft, Inc.)
561+
* Albert Vaca Cintora <albertvaka@gmail.com>

tools/ports/harfbuzz.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import shutil
88
import logging
99

10+
from tools import system_libs
11+
1012
TAG = '1.7.5'
1113
HASH = 'c2c13fc97bb74f0f13092b07804f7087e948bce49793f48b62c2c24a5792523acc0002840bebf21829172bb2e7c3df9f9625250aec6c786a55489667dd04d6a0'
1214

@@ -60,7 +62,7 @@ def create(final):
6062
cmake_cmd += ['-DCMAKE_CXX_FLAGS="{}"'.format(' '.join(extra_cflags))]
6163
cmake_cmd += ['-DCMAKE_C_FLAGS="{}"'.format(' '.join(extra_cflags))]
6264

63-
shared.run_process(cmake_cmd)
65+
shared.run_process(cmake_cmd, env=system_libs.clean_env())
6466
shared.run_process(['cmake', '--build', build_path, '--target', 'install'])
6567

6668
ports.install_header_dir(os.path.join(build_path, 'include', 'harfbuzz'))

0 commit comments

Comments
 (0)