aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-08-03 16:46:52 +0200
committerBjörn Gustavsson <[email protected]>2010-08-03 17:17:24 +0200
commit1e294a3665faeefd5755c0795e487a8bb3db702a (patch)
treee8e087fe295815f4858b73b5d472475010cf10ca
parente555530b07be38eae8f5bace72dbbd1871b8123a (diff)
downloadotp-1e294a3665faeefd5755c0795e487a8bb3db702a.tar.gz
otp-1e294a3665faeefd5755c0795e487a8bb3db702a.tar.bz2
otp-1e294a3665faeefd5755c0795e487a8bb3db702a.zip
Top-level Makefile: Remove clearmake support
-rw-r--r--Makefile.in22
1 files changed, 4 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in
index 8453c3bdf5..c837836528 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -743,14 +743,16 @@ recreate_primary_bootstrap:
# of the emulator possible
.PHONY: primary_bootstrap \
- primary_bootstrap_check_make \
primary_bootstrap_build \
primary_bootstrap_compiler \
primary_bootstrap_mkdirs \
primary_bootstrap_copy
-primary_bootstrap: primary_bootstrap_check_make
+primary_bootstrap:
@echo "=== Building a bootstrap compiler in $(BOOTSTRAP_ROOT)/bootstrap"
+ $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) \
+ ERL_TOP=$(ERL_TOP) \
+ bootstrap_clean
cd $(ERL_TOP) && \
$(MAKE) TESTROOT=$(BOOTSTRAP_TOP) \
BOOTSTRAP_TOP=$(BOOTSTRAP_TOP) \
@@ -768,22 +770,6 @@ primary_bootstrap: primary_bootstrap_check_make
$(BOOTSTRAP_TOP) \
$(BOOTSTRAP_ROOT)
-#
-# Dependencies are not complete in all makefiles; therefore, remove bootstrap
-# build result and build from scratch if we are not using clearmake (which
-# tracks dependencies itself).
-#
-primary_bootstrap_check_make:
- @ case "$(MAKE)" in \
- *clearmake*) \
- ;; \
- *) \
- $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) \
- ERL_TOP=$(ERL_TOP) \
- bootstrap_clean \
- ;; \
- esac
-
primary_bootstrap_build: primary_bootstrap_mkdirs primary_bootstrap_compiler \
primary_bootstrap_stdlib
cd lib && $(MAKE) ERLC_FLAGS='-pa $(BOOTSTRAP_COMPILER)/ebin' \