summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2010-08-10 14:31:58 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2010-08-10 14:31:58 +0200
commitbdfd2aaa1d402b3dd393a7820432f8f76e248ee1 (patch)
tree0ec4f4f72d330e74e67cd0d15770a0ebb9fd4338 /Makefile.in
parent29d5bc047964a01e55f18baf0a31387ed3b7d2cd (diff)
parent1e294a3665faeefd5755c0795e487a8bb3db702a (diff)
downloaderlang-bdfd2aaa1d402b3dd393a7820432f8f76e248ee1.tar.gz
Merge branch 'bjorn/remove-clearcase-support' into dev
* bjorn/remove-clearcase-support: Top-level Makefile: Remove clearmake support otp_build: Remove clearmake support otp_build: Remove Clearcase support for primary bootstrap and preloaded files ts: Eliminate Clearcase references in comments ts: Remove Clearcase detection
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in22
1 files changed, 4 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in
index b420628751..4b6e2e1190 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -750,14 +750,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) \
@@ -775,22 +777,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' \