Fix building when $PATH contains spaces
This commit is contained in:
1 parent
4a4cc16393
commit
ee555b9013
5 files changed
+6
-6
No files matched your search
@@ -22,7 +22,7 @@ fi
|
|||||||
|
|
||||||
mkdir -p "$PREFIX"
|
mkdir -p "$PREFIX"
|
||||||
PREFIX="$(cd "$PREFIX" && pwd)"
|
PREFIX="$(cd "$PREFIX" && pwd)"
|
||||||
export PATH=$PREFIX/bin:$PATH
|
export PATH="$PREFIX/bin:$PATH"
|
||||||
|
|
||||||
: ${CORES:=$(nproc 2>/dev/null)}
|
: ${CORES:=$(nproc 2>/dev/null)}
|
||||||
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ fi
|
|||||||
mkdir -p "$PREFIX"
|
mkdir -p "$PREFIX"
|
||||||
PREFIX="$(cd "$PREFIX" && pwd)"
|
PREFIX="$(cd "$PREFIX" && pwd)"
|
||||||
|
|
||||||
export PATH=$PREFIX/bin:$PATH
|
export PATH="$PREFIX/bin:$PATH"
|
||||||
|
|
||||||
: ${CORES:=$(nproc 2>/dev/null)}
|
: ${CORES:=$(nproc 2>/dev/null)}
|
||||||
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ fi
|
|||||||
PREFIX="$1"
|
PREFIX="$1"
|
||||||
mkdir -p "$PREFIX"
|
mkdir -p "$PREFIX"
|
||||||
PREFIX="$(cd "$PREFIX" && pwd)"
|
PREFIX="$(cd "$PREFIX" && pwd)"
|
||||||
export PATH=$PREFIX/bin:$PATH
|
export PATH="$PREFIX/bin:$PATH"
|
||||||
|
|
||||||
: ${CORES:=$(nproc 2>/dev/null)}
|
: ${CORES:=$(nproc 2>/dev/null)}
|
||||||
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ fi
|
|||||||
PREFIX="$1"
|
PREFIX="$1"
|
||||||
mkdir -p "$PREFIX"
|
mkdir -p "$PREFIX"
|
||||||
PREFIX="$(cd "$PREFIX" && pwd)"
|
PREFIX="$(cd "$PREFIX" && pwd)"
|
||||||
export PATH=$PREFIX/bin:$PATH
|
export PATH="$PREFIX/bin:$PATH"
|
||||||
|
|
||||||
: ${CORES:=$(nproc 2>/dev/null)}
|
: ${CORES:=$(nproc 2>/dev/null)}
|
||||||
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
|
||||||
|
|||||||
+2
-2
@@ -37,7 +37,7 @@ PREFIX="$(cd "$PREFIX" && pwd)"
|
|||||||
ORIGPATH="$PATH"
|
ORIGPATH="$PATH"
|
||||||
if [ -z "$HOST" ]; then
|
if [ -z "$HOST" ]; then
|
||||||
# The newly built toolchain isn't crosscompiled; add it to the path.
|
# The newly built toolchain isn't crosscompiled; add it to the path.
|
||||||
export PATH=$PREFIX/bin:$PATH
|
export PATH="$PREFIX/bin:$PATH"
|
||||||
else
|
else
|
||||||
# Crosscompiling the toolchain itself; the cross compiler is
|
# Crosscompiling the toolchain itself; the cross compiler is
|
||||||
# expected to already be in $PATH.
|
# expected to already be in $PATH.
|
||||||
@@ -137,7 +137,7 @@ fi
|
|||||||
# If building on windows, we've installed prefixless wrappers - these break
|
# If building on windows, we've installed prefixless wrappers - these break
|
||||||
# building widl, as the toolchain isn't functional yet. Restore the original
|
# building widl, as the toolchain isn't functional yet. Restore the original
|
||||||
# path.
|
# path.
|
||||||
export PATH=$ORIGPATH
|
export PATH="$ORIGPATH"
|
||||||
cd mingw-w64-tools/widl
|
cd mingw-w64-tools/widl
|
||||||
for arch in $ARCHS; do
|
for arch in $ARCHS; do
|
||||||
mkdir -p build-$CROSS_NAME$arch
|
mkdir -p build-$CROSS_NAME$arch
|
||||||
|
|||||||
Reference in new issue
Block a user