aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-09-14 16:13:15 +0200
committerBjörn Gustavsson <[email protected]>2011-09-14 17:06:16 +0200
commitbb3f5af90f947d63e36cc9922acb9958acb0ab49 (patch)
tree42a195b0d041416f1261d96f5468d57f0e42bbc9 /lib
parent7186473e4e3c87f2e0a02339d146da331cf8b01a (diff)
downloadotp-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.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile10
1 files changed, 3 insertions, 7 deletions
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