Skip to content

Commit 58a0b2c

Browse files
authored
Merge pull request #393 from edkimmel/harfbuzz_reset_env
Harfbuzz: clear environment before building ragel
2 parents 9026c8e + ae70a18 commit 58a0b2c

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

scripts/harfbuzz/1.4.4-ft/script.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ function mason_prepare_compile {
2121
FREETYPE_VERSION="2.7.1"
2222
${MASON_DIR}/mason install freetype ${FREETYPE_VERSION}
2323
MASON_FREETYPE=$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})
24-
MASON_PLATFORM= ${MASON_DIR}/mason install ragel 6.9
25-
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
24+
25+
pushd ${MASON_ROOT}/..
26+
env -i HOME="$HOME" PATH="$PATH" USER="$USER" ${MASON_DIR}/mason build ragel 6.9
27+
popd
28+
29+
export PATH=$(MASON_PLATFORM= ${MASON_DIR}/mason prefix ragel 6.9)/bin:$PATH
2630
export PKG_CONFIG_PATH="$(${MASON_DIR}/mason prefix freetype ${FREETYPE_VERSION})/lib/pkgconfig":${PKG_CONFIG_PATH:-}
2731
export C_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"
2832
export CPLUS_INCLUDE_PATH="${MASON_FREETYPE}/include/freetype2"

0 commit comments

Comments
 (0)