aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-04-17 16:15:11 +0200
committerPatrik Nyblom <[email protected]>2012-04-17 16:19:49 +0200
commitb0534e7f668f12b0d48e139c5ddbfcd85eaff4ce (patch)
treee4e6afa0a9a395aec7651c0d56c0f782163c1d5f /otp_build
parentf1a49c45e4b2ec746407fd777ba31fec6cab118e (diff)
parentd6d38a42650880bcd6c1f93c5797958857e82d60 (diff)
downloadotp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.tar.gz
otp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.tar.bz2
otp-b0534e7f668f12b0d48e139c5ddbfcd85eaff4ce.zip
Merge branch 'pg/r15/add-os-pid-to-port-info' into maint
* pg/r15/add-os-pid-to-port-info: tests: Remove line macro from port_bif_SUITE Correct documentation, erl_bif_types and dialyzer tests Make port_info(Port,os_pid) work on Windows Extend erlang:port_info/1,2 to show the OS pid of a spawned process OTP-10057
Diffstat (limited to 'otp_build')
-rwxr-xr-xotp_build4
1 files changed, 3 insertions, 1 deletions
diff --git a/otp_build b/otp_build
index 78e1b3277e..c6c73fedfa 100755
--- a/otp_build
+++ b/otp_build
@@ -1339,7 +1339,9 @@ case $TARGET in
if [ X"$OVERRIDE_TARGET" = X"" -a X"$1" != X"env_win32" -a X"$1" != X"env_msys32" -a X"$1" != X"env_msys64" ];then
echo "Building for windows, you should do the " \
"following first:" >&2
- echo 'eval `./otp_build env_msys64`' >&2
+ echo 'eval `./otp_build env_win32`' >&2
+ echo 'or' >&2
+ echo 'eval `./otp_build env_win32 x64`' >&2
echo 'please note that there are backticks (``) in' \
'the command'
exit 1