aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-08-15 13:02:13 +0200
committerBjörn Gustavsson <[email protected]>2012-08-15 13:02:13 +0200
commitc54a1c434fa263018bb3c9bb8416d4039ed807ab (patch)
tree2533cd7f6bae2567f79e824dab2eaadb3fb1986d /lib/stdlib/src
parent70e8c948bd762aa9e5413092d8c993e56197d69a (diff)
parenta2294ff1cfd3955e2e70788af314f01e47b7ee78 (diff)
downloadotp-c54a1c434fa263018bb3c9bb8416d4039ed807ab.tar.gz
otp-c54a1c434fa263018bb3c9bb8416d4039ed807ab.tar.bz2
otp-c54a1c434fa263018bb3c9bb8416d4039ed807ab.zip
Merge branch 'maint'
* maint: Update primary bootstrap Fix broken building of bootstrap compiler Conflicts: bootstrap/lib/kernel/ebin/code.beam
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index 8bdaae57fd..54186a3ba7 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -167,6 +167,7 @@ docs:
# This is a trick so that the preloaded files will get the correct type
# specifications.
primary_bootstrap_compiler: \
+ $(BOOTSTRAP_COMPILER)/ebin/epp.beam \
$(BOOTSTRAP_COMPILER)/ebin/erl_scan.beam \
$(BOOTSTRAP_COMPILER)/ebin/erl_parse.beam \
$(BOOTSTRAP_COMPILER)/ebin/erl_lint.beam \