diff options
Diffstat (limited to 'otp_build')
| -rwxr-xr-x | otp_build | 28 |
1 files changed, 13 insertions, 15 deletions
@@ -2,7 +2,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2002-2012. All Rights Reserved. +# Copyright Ericsson AB 2002-2014. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -170,6 +170,14 @@ determine_version_controller () # Special static config flags for certain platforms are set here set_config_flags () { + # + # NOTE! Do not add special flags here without a *very good* + # reason. We normally do not want "./otp_build configure" + # and "./configure" to produce different results. + # However, in the Windows case this does not matter, since + # the only supported way to build on Windows is using + # otp_build. + # # * Extra flags to pass to configure are placed in `CONFIG_FLAGS'. # * The command line is no longer added to `CONFIG_FLAGS' by # `set_config_flags'. It is instead passed directly to @@ -180,16 +188,6 @@ set_config_flags () # (in the cross compilation case the whole command line as well as # the cross configuration have been moved here). - if target_contains linux; then - XX=`echo $* | grep -v able-fp-exceptions` - if [ "$*" = "$XX" ]; then - CONFIG_FLAGS="$CONFIG_FLAGS --disable-fp-exceptions" - fi - fi - if target_contains "univel-sysv4"; then - CONFIG_FLAGS="$CONFIG_FLAGS --x-libraries=/usr/lib/X11" - fi - if target_contains free_source; then CONFIG_FLAGS="$CONFIG_FLAGS --host=$TARGET" fi @@ -1308,12 +1306,12 @@ cd $ERL_TOP determine_version_controller -# Unset ERL_FLAGS and ERL_<Release>_FLAGS during bootstrap to +# Unset ERL_FLAGS and ERL_OTP<OTP Release>_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 OTP_VERSION | sed "s|\([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. |