Commit 5322a3a0 authored by Matthew Brett's avatar Matthew Brett
Browse files

Refactor fix to env_vars.sh location

[skip ci]
parent b065fa47
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
# BUILD_DEPENDS (may be used by config.sh, can be empty) # BUILD_DEPENDS (may be used by config.sh, can be empty)
set -e set -e
# Change into root directory of repo
cd /io
# Unicode width, default 32 # Unicode width, default 32
UNICODE_WIDTH=${UNICODE_WIDTH:-32} UNICODE_WIDTH=${UNICODE_WIDTH:-32}
...@@ -18,7 +21,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse} ...@@ -18,7 +21,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
CONFIG_PATH=${CONFIG_PATH:-config.sh} CONFIG_PATH=${CONFIG_PATH:-config.sh}
# Path is relative to repository from which we ran # Path is relative to repository from which we ran
ENV_VARS_PATH="/io/${ENV_VARS_PATH:-env_vars.sh}" ENV_VARS_PATH=${ENV_VARS_PATH:-env_vars.sh}
# Always pull in common and library builder utils # Always pull in common and library builder utils
MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}") MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
...@@ -35,9 +38,6 @@ fi ...@@ -35,9 +38,6 @@ fi
# Set PATH for chosen Python, Unicode width # Set PATH for chosen Python, Unicode width
export PATH="$(cpython_path $PYTHON_VERSION $UNICODE_WIDTH)/bin:$PATH" export PATH="$(cpython_path $PYTHON_VERSION $UNICODE_WIDTH)/bin:$PATH"
# Change into root directory of repo
cd /io
# Configuration for this package, possibly overriding `build_wheel` defined in # Configuration for this package, possibly overriding `build_wheel` defined in
# `common_utils.sh` via `manylinux_utils.sh`. # `common_utils.sh` via `manylinux_utils.sh`.
source "$CONFIG_PATH" source "$CONFIG_PATH"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment