Skip to content

Commit 863c9d7

Browse files
JudahJLDuncaen
andauthored
Update srcpkgs/zeditor/template
Co-authored-by: Duncan Overbruck <github@duncano.de>
1 parent 41a8e4f commit 863c9d7

1 file changed

Lines changed: 9 additions & 26 deletions

File tree

srcpkgs/zeditor/template

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,16 @@ pre_build() {
2525
if [ "$CROSS_BUILD" ]; then
2626
export PKG_CONFIG_ALLOW_CROSS=1
2727

28-
local target_env="${RUST_TARGET//-/_}"
29-
target_env="${target_env^^}"
28+
# workaround the cc-rs mixing CFLAGS for host and target.
29+
# https://github.com/rust-lang/cc-rs/issues/1469
30+
export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}" \
31+
CXXFLAGS_${RUST_BUILD//-/_}="${CXXFLAGS_host}" \
32+
LDFLAGS_${RUST_BUILD//-/_}="${LDFLAGS_host}" \
33+
CFLAGS_${RUST_TARGET//-/_}="${CFLAGS}" \
34+
CXXFLAGS_${RUST_TARGET//-/_}="${CXXFLAGS}" \
35+
LDFLAGS_${RUST_TARGET//-/_}="${LDFLAGS}" \
36+
CFLAGS="" CXXFLAGS="" LDFLAGS=""
3037

31-
local cc_var="CC_${target_env}"
32-
local cflags_var="CFLAGS_${target_env}"
33-
local ldflags_var="LDFLAGS_${target_env}"
34-
35-
echo "Cross-compilation environment setup:"
36-
echo "${cc_var} = ${!cc_var}"
37-
echo "${cflags_var} = ${!cflags_var}"
38-
echo "${ldflags_var} = ${!ldflags_var}"
39-
echo "---"
40-
echo "Original CC = $CC"
41-
echo "Original CFLAGS = $CFLAGS"
42-
echo "---"
43-
44-
export "CC_${target_env}=$CC"
45-
export "CFLAGS_${target_env}=$CFLAGS"
46-
export "LDFLAGS_${target_env}=$LDFLAGS"
47-
48-
echo "${cc_var} = ${!cc_var}"
49-
echo "${cflags_var} = ${!cflags_var}"
50-
echo "${ldflags_var} = ${!ldflags_var}"
51-
echo "---"
52-
unset CFLAGS
53-
unset LDFLAGS
54-
unset CXXFLAGS
5538
fi
5639
}
5740

0 commit comments

Comments
 (0)