aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-05-09 20:18:53 +0200
committerLukas Larsson <[email protected]>2016-05-09 20:18:53 +0200
commit929039adce30e62592cec1e8334dab99c4581b83 (patch)
treee4362b3c7db9e9fb8f4e81086116e1daf1f72467 /otp_build
parent2c3faa179d8c32f99d3a7365b808cbb746b36f38 (diff)
parent98b8650d22e94a5ff839170833f691294f6276d0 (diff)
downloadotp-929039adce30e62592cec1e8334dab99c4581b83.tar.gz
otp-929039adce30e62592cec1e8334dab99c4581b83.tar.bz2
otp-929039adce30e62592cec1e8334dab99c4581b83.zip
Merge branch 'binarin/fix-build-tool-paths/PR-1023/OTP-13562'
* binarin/fix-build-tool-paths/PR-1023/OTP-13562: Fix program paths used in build process Conflicts: erts/configure.in
Diffstat (limited to 'otp_build')
-rwxr-xr-xotp_build4
1 files changed, 2 insertions, 2 deletions
diff --git a/otp_build b/otp_build
index 57dc2e3a9c..1b79b0b0fe 100755
--- a/otp_build
+++ b/otp_build
@@ -139,7 +139,7 @@ check_erltop ()
if [ "X$ERL_TOP" = "X" ]; then
if [ -f ./otp_build -a -f ./erts/autoconf/config.guess ]; then
ERLTOP_FORCED=true
- ERL_TOP=`/bin/pwd`
+ ERL_TOP=`pwd`
export ERL_TOP
else
echo "The environment variable ERL_TOP must be set." >&2
@@ -679,7 +679,7 @@ echo_env_erltop ()
if [ X"$ERL_TOP" = X"" -o "$ERLTOP_FORCED" = "true" ]; then
if [ -f ./otp_build ]; then
# Seems to be current directory...
- echo_setenv ERL_TOP `/bin/pwd` ';'
+ echo_setenv ERL_TOP `pwd` ';'
else
echo "You need to either set ERL_TOP first or stand in the same" \
"directory as this script resides in." >&2