diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2019-11-14 09:20:02 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2019-11-14 09:20:02 +0100 |
| commit | afb9501f99bf94b05f999cd341dade721f69d023 (patch) | |
| tree | ea7108658df4152cfbde5e84bf010045dac6ff58 /erts/emulator/utils | |
| parent | 9adc0b044a1e2a01537775b8076bee29586b4870 (diff) | |
| parent | 78354470a93df501d7803d3a3e51f199ec8c9475 (diff) | |
| download | erlang-afb9501f99bf94b05f999cd341dade721f69d023.tar.gz | |
Merge branch 'dgud/cleanup-windows-build'
* dgud/cleanup-windows-build:
Refactor otp_build env_win32
Speedup depend.mk creation
Refactor win32 configure handling
Diffstat (limited to 'erts/emulator/utils')
| -rwxr-xr-x | erts/emulator/utils/make_preload | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/erts/emulator/utils/make_preload b/erts/emulator/utils/make_preload index 0cd3509b62..04163bc63b 100755 --- a/erts/emulator/utils/make_preload +++ b/erts/emulator/utils/make_preload @@ -40,7 +40,6 @@ use File::Basename; my $gen_rc = 0; my $gen_old = 0; my $windres = 0; -my $msys = 0; my $file; my $progname = basename($0); @@ -51,8 +50,6 @@ while (@ARGV && $ARGV[0] =~ /^-(\w+)/) { $gen_rc = 1; } elsif ($opt eq '-windres') { $windres = 1; - } elsif ($opt eq '-msys') { - $msys = 1; } elsif ($opt eq '-old') { $gen_old = 1; } else { @@ -73,12 +70,7 @@ foreach $file (@ARGV) { my $module = basename($file, ".beam"); if ($gen_rc) { my $win_file; - if ($msys) { - ($win_file) = split("\n", `(msys2win_path.sh $file)`); - } else { - ($win_file) = split("\n", `(cygpath -d $file 2>/dev/null || cygpath -w $file)`); - } - $win_file =~ s&\\&\\\\&g; + ($win_file) = split("\n", `(w32_path.sh -d $file)`); print "$num ERLANG_CODE \"$win_file\"\n"; push(@modules, " ", -s $file, "L, $num, ", length($module), ",\"$module\",\n"); |