moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

common: unset rust-cross specific variables for native builds

Browse source
This commit is contained in:
Johannes 2019-02-08 17:36:42 +01:00 • committed by Johannes
parent 607aa7df3c
commit 026ebc069e
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/build-helper/rust.sh
View file

@ -16,6 +16,8 @@ if [ "$CROSS_BUILD" ]; then
# [build] # [build]
# target = ${RUST_TARGET} # target = ${RUST_TARGET}
export CARGO_BUILD_TARGET="$RUST_TARGET" export CARGO_BUILD_TARGET="$RUST_TARGET"
else
unset CARGO_BUILD_TARGET
fi fi
# For cross-compiling rust -sys crates # For cross-compiling rust -sys crates

2
common/xbps-src/shutils/common.sh
View file

@ -313,6 +313,7 @@ setup_pkg() {
export XBPS_TARGET_MACHINE=${XBPS_ARCH:-$XBPS_MACHINE} export XBPS_TARGET_MACHINE=${XBPS_ARCH:-$XBPS_MACHINE}
unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS XBPS_CROSS_FFLAGS unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS XBPS_CROSS_FFLAGS
unset XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS unset XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS
unset XBPS_CROSS_RUSTFLAGS XBPS_CROSS_RUST_TARGET
XBPS_INSTALL_XCMD="$XBPS_INSTALL_CMD" XBPS_INSTALL_XCMD="$XBPS_INSTALL_CMD"
XBPS_QUERY_XCMD="$XBPS_QUERY_CMD" XBPS_QUERY_XCMD="$XBPS_QUERY_CMD"
@ -546,6 +547,7 @@ setup_pkg() {
unset CC_host CXX_host CPP_host GCC_host FC_host LD_host AR_host AS_host unset CC_host CXX_host CPP_host GCC_host FC_host LD_host AR_host AS_host
unset RANLIB_host STRIP_host OBJDUMP_host OBJCOPY_host NM_host READELF_host unset RANLIB_host STRIP_host OBJDUMP_host OBJCOPY_host NM_host READELF_host
unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host
unset RUSTFLAGS
fi fi
# Setup some specific package vars. # Setup some specific package vars.