diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-14 16:13:15 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-14 17:06:16 +0200 |
| commit | bb3f5af90f947d63e36cc9922acb9958acb0ab49 (patch) | |
| tree | 42a195b0d041416f1261d96f5468d57f0e42bbc9 | |
| parent | 7186473e4e3c87f2e0a02339d146da331cf8b01a (diff) | |
| download | otp-bb3f5af90f947d63e36cc9922acb9958acb0ab49.tar.gz otp-bb3f5af90f947d63e36cc9922acb9958acb0ab49.tar.bz2 otp-bb3f5af90f947d63e36cc9922acb9958acb0ab49.zip | |
Merge the fourth bootstrap stage into the third bootstrap stage
The sasl application used to have snmp MIBs, thus requiring the
snmp and sasl applications to be built in separate bootstrap
stage. Since the MIBs in sasl have been moved to the otp_mibs
application, the third and fourth bootstrap stages can be merged.
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | lib/Makefile | 10 |
2 files changed, 4 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index bce797e6ed..d758b47860 100644 --- a/Makefile.in +++ b/Makefile.in @@ -349,8 +349,7 @@ endif all_bootstraps: emulator \ bootstrap_setup \ secondary_bootstrap_build secondary_bootstrap_copy \ - tertiary_bootstrap_build tertiary_bootstrap_copy \ - fourth_bootstrap_build fourth_bootstrap_copy + tertiary_bootstrap_build tertiary_bootstrap_copy # # Use these targets when you want to use the erl and erlc @@ -643,13 +642,6 @@ tertiary_bootstrap_copy: true; \ done # cp lib/snmp/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/snmp/ebin - -fourth_bootstrap_build: - cd lib && \ - ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \ - $(MAKE) opt FOURTH_BOOTSTRAP=true - -fourth_bootstrap_copy: if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl ; fi if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/ebin ; fi if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/sasl/include ; fi @@ -736,7 +728,6 @@ fourth_bootstrap_copy: cp $$x $$TF; \ true; \ done - # cp lib/syntax_tools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin .PHONY: check_recreate_primary_bootstrap recreate_primary_bootstrap @@ -908,7 +899,6 @@ old_bootstrap_nc_for_ne_all_stages: cd lib && $(MAKE) BOOTSTRAP=1 TYPE=release release cd lib && $(MAKE) SECONDARY_BOOTSTRAP=1 TYPE=release release cd lib && $(MAKE) TERTIARY_BOOTSTRAP=1 TYPE=release release - cd lib && $(MAKE) FOURTH_BOOTSTRAP=1 TYPE=release release diff --git a/lib/Makefile b/lib/Makefile index be86696ca3..98d746925f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -89,13 +89,9 @@ else SUB_DIRECTORIES = hipe parsetools asn1/src else ifdef TERTIARY_BOOTSTRAP - SUB_DIRECTORIES = snmp - else - ifdef FOURTH_BOOTSTRAP - SUB_DIRECTORIES = sasl jinterface ic syntax_tools - else # Not bootstrap build - SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES) - endif + SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools + else # Not bootstrap build + SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES) endif endif endif |