From 51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Tue, 10 Dec 2013 09:52:50 +0100 Subject: Update versions of OTP, erts, kernel, and stdlib Update versions of OTP, erts, kernel, and stdlib to comply with the new version scheme decided by the OTP technical board. --- otp_build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'otp_build') diff --git a/otp_build b/otp_build index 093fde8034..ca3ffa21a8 100755 --- a/otp_build +++ b/otp_build @@ -1308,12 +1308,12 @@ cd $ERL_TOP determine_version_controller -# Unset ERL_FLAGS and ERL__FLAGS during bootstrap to +# Unset ERL_FLAGS and ERL_OTP_FLAGS during bootstrap to # prevent potential problems -sys_vsn=`awk '/SYSTEM_VSN = / {print $3}' < erts/vsn.mk` -sys_erl_flags="ERL_${sys_vsn}_FLAGS" +otp_major_vsn=`cat erts/vsn.mk | grep SYSTEM_VSN | sed "s|SYSTEM_VSN[^=]*=[^0-9]*\([0-9]*\).*|\1|"` +erl_otp_flags="ERL_OTP${otp_major_vsn}_FLAGS" unset ERL_FLAGS -unset ${sys_erl_flags} +unset ${erl_otp_flags} # Target first guess, won't necessarily hold, may be changed for # certain parameters. -- cgit v1.2.3