aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-07-29 16:58:36 +0200
committerBjörn Gustavsson <[email protected]>2010-08-03 17:17:24 +0200
commite555530b07be38eae8f5bace72dbbd1871b8123a (patch)
tree0b38de6415e8cb8018c8ef55338f7031cef0147f
parentaa7696f806357e09dbef60b3ea8d2a07e499d5db (diff)
downloadotp-e555530b07be38eae8f5bace72dbbd1871b8123a.tar.gz
otp-e555530b07be38eae8f5bace72dbbd1871b8123a.tar.bz2
otp-e555530b07be38eae8f5bace72dbbd1871b8123a.zip
otp_build: Remove clearmake support
-rwxr-xr-xotp_build31
1 files changed, 4 insertions, 27 deletions
diff --git a/otp_build b/otp_build
index 44c066e40a..41bce4ec42 100755
--- a/otp_build
+++ b/otp_build
@@ -21,9 +21,6 @@
# Expected autoconf version
EXPECTED_AUTOCONF_VERSION=2.59
-# clearmake command to use
-clearmake=false
-
# Global configuration variables
#
# NOTE: lazy_configure depends on '.' always being last directory
@@ -859,36 +856,16 @@ setup_make ()
win32)
MAKE=make;;
*)
- if [ "X$CLEARCASE_MAKE_COMPAT" = "Xgnu" -a \
- X"$CLEARCASE_ROOT" != X"" -a \
- -n "`lookup_prog_in_path clearmake`" ]; then
- clearmake="clearmake -V"
- MAKE=$clearmake
- else
- if [ -n "`lookup_prog_in_path gmake`" ]; then
- MAKE=gmake
- else
- MAKE=make
- fi
+ if [ -n "`lookup_prog_in_path gmake`" ]; then
+ MAKE=gmake
+ else
+ MAKE=make
fi;;
esac
fi
export MAKE
}
-do_noboot_lib_and_erts ()
-{
- setup_make
- EMULATORS=emulator
- if [ X`$MAKE is_cross_configured` = Xyes ]; then
- TARGET=`$MAKE target_configured`
- fi
- if [ "x$MAKE" != "x$clearmake" ]; then
- $MAKE MAKE="$MAKE" TARGET=$TARGET OTP_SMALL_BUILD=$OTP_SMALL_BUILD depend || exit 1;
- fi
- $MAKE MAKE="$MAKE" TARGET=$TARGET OTP_SMALL_BUILD=$OTP_SMALL_BUILD TYPE=$TYPE FLAVOR=$FLAVOR noboot || exit 1
-}
-
do_primary_git ()
{
setup_make