Fix Apple deployment env and refresh NSC caches
This commit is contained in:
parent
b81a3377df
commit
52b7f102f0
4 changed files with 13 additions and 1 deletions
|
|
@ -88,7 +88,19 @@ for VAR_NAME in HOME CARGO_HOME CARGO_TARGET_DIR RUSTUP_HOME RUSTC_WRAPPER SCCAC
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
EFFECTIVE_CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-${CONFIGURATION_TEMP_DIR}/target}"
|
EFFECTIVE_CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-${CONFIGURATION_TEMP_DIR}/target}"
|
||||||
env -i PATH="$CARGO_PATH" PROTOC="$PROTOC" CARGO_TARGET_DIR="${EFFECTIVE_CARGO_TARGET_DIR}" IPHONEOS_DEPLOYMENT_TARGET="$IPHONEOS_DEPLOYMENT_TARGET" MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" "${EXTRA_ENV[@]}" cargo build "${CARGO_ARGS[@]}"
|
BUILD_ENV=(
|
||||||
|
"PATH=$CARGO_PATH"
|
||||||
|
"PROTOC=$PROTOC"
|
||||||
|
"CARGO_TARGET_DIR=${EFFECTIVE_CARGO_TARGET_DIR}"
|
||||||
|
"${EXTRA_ENV[@]}"
|
||||||
|
)
|
||||||
|
if [[ -n "${IPHONEOS_DEPLOYMENT_TARGET:-}" ]]; then
|
||||||
|
BUILD_ENV+=("IPHONEOS_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET}")
|
||||||
|
fi
|
||||||
|
if [[ -n "${MACOSX_DEPLOYMENT_TARGET:-}" ]]; then
|
||||||
|
BUILD_ENV+=("MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}")
|
||||||
|
fi
|
||||||
|
env -i "${BUILD_ENV[@]}" cargo build "${CARGO_ARGS[@]}"
|
||||||
|
|
||||||
mkdir -p "${BUILT_PRODUCTS_DIR}"
|
mkdir -p "${BUILT_PRODUCTS_DIR}"
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue