teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-style/meson.sh: move <lang>_args to build-in options section and fix cross compiling of rust code

Browse Source 
It seems like meson is dropping rust_args when testing the rust compiler, so we just append them directly to rustc
This commit is contained in:
John 2021-02-20 13:12:20 +01:00
parent ff23fcb468
commit 297fd7327e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/build-style/meson.sh
View File

@ -53,7 +53,7 @@ strip = '${STRIP}'
readelf = '${READELF}' readelf = '${READELF}'
objcopy = '${OBJCOPY}' objcopy = '${OBJCOPY}'
pkgconfig = '${PKG_CONFIG}' pkgconfig = '${PKG_CONFIG}'
rust = 'rustc' rust = ['rustc', '--target', '${RUST_TARGET}' ,'--sysroot', '${XBPS_CROSS_BASE}/usr']
g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner' g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner'
g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler' g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler'
g-ir-generate = '${XBPS_CROSS_BASE}/usr/bin/g-ir-generate' g-ir-generate = '${XBPS_CROSS_BASE}/usr/bin/g-ir-generate'
@ -62,6 +62,8 @@ cups-config = '${XBPS_CROSS_BASE}/usr/bin/cups-config'
[properties] [properties]
needs_exe_wrapper = true needs_exe_wrapper = true
[built-in options]
c_args = ['$(echo ${CFLAGS} | sed -r "s/\s+/','/g")'] c_args = ['$(echo ${CFLAGS} | sed -r "s/\s+/','/g")']
c_link_args = ['$(echo ${LDFLAGS} | sed -r "s/\s+/','/g")'] c_link_args = ['$(echo ${LDFLAGS} | sed -r "s/\s+/','/g")']