diff options
Diffstat (limited to 'otp_build')
| -rwxr-xr-x | otp_build | 35 |
1 files changed, 9 insertions, 26 deletions
@@ -186,15 +186,15 @@ set_config_flags () if target_contains free_source; then CONFIG_FLAGS="$CONFIG_FLAGS --host=$TARGET" fi - # Link SSL static for all binary distributions if not overridden - # Even for win32 starting with R14B03 - XX=`echo $* | grep -v dynamic-ssl-lib` - if [ "$*" = "$XX" ]; then - CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS" - fi + # Link SSL static for win32 binary distributions if not overridden if target_contains win32; then + XX=`echo $* | grep -v dynamic-ssl-lib` + if [ "$*" = "$XX" ]; then + CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS" + fi CONFIG_FLAGS="--build=$BUILDSYS build_alias=win32 --host=win32 --target=win32 $CONFIG_FLAGS" fi + if [ "x$OVERRIDE_CONFIG_CACHE" = "x" ]; then CONFIG_FLAGS="$CONFIG_FLAGS --cache-file=/dev/null" @@ -324,16 +324,6 @@ do_autoconf () fi } -mk_targetdir () -{ - if [ ! -d $ERL_TOP/$TARGET ]; then - echo "creating $ERL_TOP/$TARGET" - mkdir $ERL_TOP/$TARGET - else - echo "existing $ERL_TOP/$TARGET is used" - fi -} - run_configure () { cdir="$ERL_TOP" @@ -499,7 +489,6 @@ maybe_copy_static_cache () do_configure () { setup_make - mk_targetdir # Get `erl_build_tool_vars' . "$ERL_TOP/erl-build-tool-vars.sh" || exit 1 @@ -513,7 +502,6 @@ do_configure () hide_vars OVERRIDE_TARGET TARGET TARGET=$BUILDSYS export TARGET - mk_targetdir set_config_flags "$@" run_configure "$@" restore_vars OVERRIDE_TARGET TARGET;; @@ -878,8 +866,10 @@ do_primary_git () git add -A bootstrap/lib/kernel \ bootstrap/lib/stdlib \ bootstrap/lib/compiler \ - bootstrap/lib/orber/include \ bootstrap/bin + find bootstrap -name egen -o -name '*.script' -o \ + -name '*.app' -o -name '*.appup' | + xargs git reset HEAD git commit --no-verify -m 'Update primary bootstrap' } @@ -1001,24 +991,17 @@ do_copy_primary_bootstrap () test -d $bootstrap/lib/kernel/ebin || mkdir -p $bootstrap/lib/kernel/ebin test -d $bootstrap/lib/kernel/include || mkdir -p $bootstrap/lib/kernel/include cp -f $lib_src/kernel/ebin/*.beam $bootstrap/lib/kernel/ebin - cp -f $lib_src/kernel/ebin/*.app* $bootstrap/lib/kernel/ebin cp -f $lib_src/kernel/include/*.hrl $bootstrap/lib/kernel/include # stdlib test -d $bootstrap/lib/stdlib/ebin || mkdir -p $bootstrap/lib/stdlib/ebin test -d $bootstrap/lib/stdlib/include || mkdir -p $bootstrap/lib/stdlib/include cp -f $lib_src/stdlib/ebin/*.beam $bootstrap/lib/stdlib/ebin - cp -f $lib_src/stdlib/ebin/*.app* $bootstrap/lib/stdlib/ebin cp -f $lib_src/stdlib/include/*.hrl $bootstrap/lib/stdlib/include # compiler test -d $bootstrap/lib/compiler/ebin || mkdir -p $bootstrap/lib/compiler/ebin cp -f $lib_src/compiler/ebin/*.beam $bootstrap/lib/compiler/ebin - cp -f $lib_src/compiler/ebin/*.app* $bootstrap/lib/compiler/ebin - - # orber include - test -d $bootstrap/lib/orber/include || mkdir -p $bootstrap/lib/orber/include - cp -f $lib_src/orber/include/* $bootstrap/lib/orber/include # bootstrap bin if [ $bootstrap_src_top != $ERL_TOP ]; then |