mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2025-02-26 08:22:31 +00:00
macOS build: build Boost with same custom iconv as rest of MKVToolNix
This commit is contained in:
parent
71c6319e26
commit
e43d58994b
6
Rakefile
6
Rakefile
@ -1035,15 +1035,15 @@ end
|
||||
|
||||
# libraries required for all programs via mtxcommon
|
||||
$common_libs = [
|
||||
:boost_filesystem,
|
||||
:boost_regex,
|
||||
:boost_system,
|
||||
:magic,
|
||||
:flac,
|
||||
:z,
|
||||
:pugixml,
|
||||
:intl,
|
||||
:iconv,
|
||||
:boost_regex,
|
||||
:boost_filesystem,
|
||||
:boost_system,
|
||||
:fmt,
|
||||
]
|
||||
|
||||
|
@ -243,7 +243,7 @@ function build_gettext {
|
||||
function build_boost {
|
||||
local -a args properties
|
||||
|
||||
args=(--reconfigure -sICONV_PATH=/usr -j$DRAKETHREADS --prefix=TMPDIR/${TARGET} --libdir=TMPDIR/${TARGET}/lib)
|
||||
args=(--reconfigure -sICONV_PATH=${TARGET} -j$DRAKETHREADS --prefix=TMPDIR/${TARGET} --libdir=TMPDIR/${TARGET}/lib)
|
||||
properties=(toolset=clang link=static variant=release)
|
||||
if [[ -n $CXXFLAGS ]] properties+=(cxxflags="${(q)CXXFLAGS}")
|
||||
if [[ -n $LDFLAGS ]] properties+=(linkflags="${(q)LDFLAGS}")
|
||||
|
Loading…
Reference in New Issue
Block a user