File 4712-Fix-executable-extensions.patch of Package erlang
From 407d5956558d77add2d693e29ff4c37516085ba1 Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson <dgud@erlang.org> Date: Mon, 20 Jan 2020 10:11:33 -0800 Subject: [PATCH 02/11] Fix executable extensions In WSL binaries must be invoked with .exe extension. --- erts/emulator/Makefile.in | 2 ++ erts/lib_src/yielding_c_fun/main_target.mk | 2 +- lib/diameter/src/Makefile | 8 +++++++- lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile | 7 +++++-- lib/stdlib/src/Makefile | 8 +++++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 32caf5023c..319987580e 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -274,9 +274,11 @@ USING_MINGW=@MIXED_MINGW@ ifeq ($(TARGET),win32) LIB_PREFIX= LIB_SUFFIX=.lib +EXE_SUFFIX=.exe else LIB_PREFIX=lib LIB_SUFFIX=.a +EXE_SUFFIX= endif ifeq (@EMU_LOCK_CHECKING@,yes) diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile index 98636ed6e2..4b626db301 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -96,6 +96,12 @@ APPUP_FILE = diameter.appup APPUP_SRC = $(APPUP_FILE).src APPUP_TARGET = $(EBIN)/$(APPUP_FILE) +ifeq ($(TARGET),win32) + EXE_SUFFIX=.exe +else + EXE_SUFFIX= +endif + # ---------------------------------------------------- # Flags # ---------------------------------------------------- @@ -123,7 +129,7 @@ ERL_COMPILE_FLAGS += \ # erl/hrl from dictionary file. gen/diameter_gen_%.erl gen/diameter_gen_%.hrl: dict/%.dia $(dia_verbose) \ - escript ../bin/diameterc -o gen -i $(EBIN) $< + escript$(EXE_SUFFIX) ../bin/diameterc -o gen -i $(EBIN) $< opt: $(TARGET_FILES) diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile index ee616f3d7e..bcbb206db6 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile @@ -67,8 +67,11 @@ JARFILE= OtpErlang.jar # ---------------------------------------------------- # Programs and Flags # ---------------------------------------------------- - -JAR= jar +ifeq ($(TARGET),win32) + JAR=jar.exe +else + JAR=jar +endif CLASSPATH = $(JAVA_SRC_ROOT) diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile index 86003c953d..dd209fd906 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile @@ -149,6 +149,12 @@ APPUP_FILE= stdlib.appup APPUP_SRC= $(APPUP_FILE).src APPUP_TARGET= $(EBIN)/$(APPUP_FILE) +ifeq ($(TARGET),win32) + EXE_SUFFIX=.exe +else + EXE_SUFFIX= +endif + # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- @@ -207,7 +213,7 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ unicode_util.erl: ../uc_spec/* - escript ../uc_spec/gen_unicode_mod.escript + escript$(EXE_SUFFIX) ../uc_spec/gen_unicode_mod.escript # ---------------------------------------------------- # Release Target -- 2.16.4