From 87e74df3187e4cb7497d8bc693a017adbfd302f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 15 Aug 2012 11:45:09 +0200 Subject: Fix broken building of bootstrap compiler Commit df8e67e203b83f95d1e098fec88ad5d0ad840069 broke "./otp_build update_primary" because epp:parse_file/4 was added and used from the compiler, but the epp module is not part of the primary compiler that is used to compile the bootstrap compiler. Fix the problem by including the epp module in the primary compiler. --- lib/stdlib/src/Makefile | 1 + 1 file changed, 1 insertion(+) 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 \ -- cgit v1.2.3 From a2294ff1cfd3955e2e70788af314f01e47b7ee78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 15 Aug 2012 11:51:07 +0200 Subject: Update primary bootstrap --- bootstrap/lib/compiler/ebin/beam_type.beam | Bin 13852 -> 14032 bytes bootstrap/lib/compiler/ebin/beam_utils.beam | Bin 14552 -> 14604 bytes bootstrap/lib/compiler/ebin/beam_validator.beam | Bin 34476 -> 34536 bytes bootstrap/lib/compiler/ebin/compile.beam | Bin 37112 -> 37460 bytes bootstrap/lib/compiler/ebin/sys_pre_expand.beam | Bin 16292 -> 16292 bytes bootstrap/lib/kernel/ebin/code.beam | Bin 6708 -> 6716 bytes bootstrap/lib/kernel/ebin/code_server.beam | Bin 26228 -> 26256 bytes bootstrap/lib/kernel/ebin/rpc.beam | Bin 8748 -> 8748 bytes bootstrap/lib/stdlib/ebin/epp.beam | Bin 24188 -> 24276 bytes bootstrap/lib/stdlib/ebin/erl_lint.beam | Bin 85064 -> 85172 bytes bootstrap/lib/stdlib/ebin/escript.beam | Bin 16876 -> 17056 bytes bootstrap/lib/stdlib/ebin/gen_server.beam | Bin 17256 -> 17260 bytes 12 files changed, 0 insertions(+), 0 deletions(-) diff --git a/bootstrap/lib/compiler/ebin/beam_type.beam b/bootstrap/lib/compiler/ebin/beam_type.beam index 116da39f89..3cb5f06859 100644 Binary files a/bootstrap/lib/compiler/ebin/beam_type.beam and b/bootstrap/lib/compiler/ebin/beam_type.beam differ diff --git a/bootstrap/lib/compiler/ebin/beam_utils.beam b/bootstrap/lib/compiler/ebin/beam_utils.beam index 9c6ad019f9..523a6f03fb 100644 Binary files a/bootstrap/lib/compiler/ebin/beam_utils.beam and b/bootstrap/lib/compiler/ebin/beam_utils.beam differ diff --git a/bootstrap/lib/compiler/ebin/beam_validator.beam b/bootstrap/lib/compiler/ebin/beam_validator.beam index 52643de79a..41523ed185 100644 Binary files a/bootstrap/lib/compiler/ebin/beam_validator.beam and b/bootstrap/lib/compiler/ebin/beam_validator.beam differ diff --git a/bootstrap/lib/compiler/ebin/compile.beam b/bootstrap/lib/compiler/ebin/compile.beam index e2bd3c4ce0..c685035e23 100644 Binary files a/bootstrap/lib/compiler/ebin/compile.beam and b/bootstrap/lib/compiler/ebin/compile.beam differ diff --git a/bootstrap/lib/compiler/ebin/sys_pre_expand.beam b/bootstrap/lib/compiler/ebin/sys_pre_expand.beam index f7e9541e4c..1a176b2e3f 100644 Binary files a/bootstrap/lib/compiler/ebin/sys_pre_expand.beam and b/bootstrap/lib/compiler/ebin/sys_pre_expand.beam differ diff --git a/bootstrap/lib/kernel/ebin/code.beam b/bootstrap/lib/kernel/ebin/code.beam index 31ccb7367d..b7e4a46066 100644 Binary files a/bootstrap/lib/kernel/ebin/code.beam and b/bootstrap/lib/kernel/ebin/code.beam differ diff --git a/bootstrap/lib/kernel/ebin/code_server.beam b/bootstrap/lib/kernel/ebin/code_server.beam index adc53aa5f3..dc10d111d2 100644 Binary files a/bootstrap/lib/kernel/ebin/code_server.beam and b/bootstrap/lib/kernel/ebin/code_server.beam differ diff --git a/bootstrap/lib/kernel/ebin/rpc.beam b/bootstrap/lib/kernel/ebin/rpc.beam index 4355f300e9..bfb80cf827 100644 Binary files a/bootstrap/lib/kernel/ebin/rpc.beam and b/bootstrap/lib/kernel/ebin/rpc.beam differ diff --git a/bootstrap/lib/stdlib/ebin/epp.beam b/bootstrap/lib/stdlib/ebin/epp.beam index 55f5adc24d..2e2b3ef4ed 100644 Binary files a/bootstrap/lib/stdlib/ebin/epp.beam and b/bootstrap/lib/stdlib/ebin/epp.beam differ diff --git a/bootstrap/lib/stdlib/ebin/erl_lint.beam b/bootstrap/lib/stdlib/ebin/erl_lint.beam index 798924c19b..875ccf94c2 100644 Binary files a/bootstrap/lib/stdlib/ebin/erl_lint.beam and b/bootstrap/lib/stdlib/ebin/erl_lint.beam differ diff --git a/bootstrap/lib/stdlib/ebin/escript.beam b/bootstrap/lib/stdlib/ebin/escript.beam index 17881e2552..e832f973d7 100644 Binary files a/bootstrap/lib/stdlib/ebin/escript.beam and b/bootstrap/lib/stdlib/ebin/escript.beam differ diff --git a/bootstrap/lib/stdlib/ebin/gen_server.beam b/bootstrap/lib/stdlib/ebin/gen_server.beam index 3fa7d89db4..5d68dda4cf 100644 Binary files a/bootstrap/lib/stdlib/ebin/gen_server.beam and b/bootstrap/lib/stdlib/ebin/gen_server.beam differ -- cgit v1.2.3