aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-08-27 09:36:08 +0200
committerBjörn Gustavsson <[email protected]>2012-08-27 09:36:08 +0200
commit7f68805f5c07abeb887d5634706ebca3b8747e79 (patch)
tree1f524a13575aa9eae19b8e2a2879aeb3ef1a100c /erts/emulator
parent8830e82923e15981fb73d9974cd4bfb04d772b16 (diff)
parentae2c50f36806b26530de88d2609cd6ced018cb54 (diff)
downloadotp-7f68805f5c07abeb887d5634706ebca3b8747e79.tar.gz
otp-7f68805f5c07abeb887d5634706ebca3b8747e79.tar.bz2
otp-7f68805f5c07abeb887d5634706ebca3b8747e79.zip
Merge branch 'maint'
* maint: make_preload: Don't fail if Perl's default file encoding is UTF-8
Diffstat (limited to 'erts/emulator')
-rwxr-xr-xerts/emulator/utils/make_preload1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/utils/make_preload b/erts/emulator/utils/make_preload
index 13019d4062..4e329b24f8 100755
--- a/erts/emulator/utils/make_preload
+++ b/erts/emulator/utils/make_preload
@@ -87,6 +87,7 @@ foreach $file (@ARGV) {
my $comment = '';
open(FILE, $file) or error("failed to read $file: $!");
+ binmode(FILE);
$_ = <FILE>;
$_ = beam_strip($_);
close(FILE);