diff options
| author | Rickard Green <[email protected]> | 2014-01-13 20:38:24 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-01-13 20:38:24 +0100 |
| commit | fc8cc0057b1f492f359d4f644fe93fdbc75074e8 (patch) | |
| tree | 63f496f61ea5e63605c5346bd267a9d0f312a96b /otp_build | |
| parent | 589eba64f9c1fdef8a717c930aa8a51c47291a53 (diff) | |
| parent | 47979206defa9429458e419b691138ab1b519833 (diff) | |
| download | otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.tar.gz otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.tar.bz2 otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.zip | |
Merge branch 'rickard/otp-17-vsn-fix'
* rickard/otp-17-vsn-fix:
Fix issues with new versioning
Diffstat (limited to 'otp_build')
| -rwxr-xr-x | otp_build | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1310,7 +1310,7 @@ determine_version_controller # Unset ERL_FLAGS and ERL_OTP<Major-VSN>_FLAGS during bootstrap to # prevent potential problems -otp_major_vsn=`cat erts/vsn.mk | grep SYSTEM_VSN | sed "s|SYSTEM_VSN[^=]*=[^0-9]*\([0-9]*\).*|\1|"` +otp_major_vsn=`cat erts/vsn.mk | grep SYSTEM_VSN | sed "s|SYSTEM_VSN[^=]*=[^0-9]*\([0-9]*\).*|\1|g"` erl_otp_flags="ERL_OTP${otp_major_vsn}_FLAGS" unset ERL_FLAGS unset ${erl_otp_flags} |