File 0525-erts-Fix-building-of-debuginfo-on-windows.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0525-erts-Fix-building-of-debuginfo-on-windows.patch of Package erlang (Revision 0c95bdcb413813ad538c04f6e313b575)

Currently displaying revision 0c95bdcb413813ad538c04f6e313b575 , Show latest

From 590aea1479be12806ce029c0de916d9966ab6c35 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 11 Aug 2022 09:22:58 +0200
Subject: [PATCH 25/34] erts: Fix building of debuginfo on windows

---
 make/configure.ac | 4 ----
 otp_build         | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/make/configure.in b/make/configure.in
index e0d4103b6e..1276caecbc 100644
--- a/make/configure.in
+++ b/make/configure.in
@@ -212,10 +212,6 @@ AS_HELP_STRING([--disable-parallel-configure], [disable parallel execution of co
 AC_ARG_ENABLE(dirty-schedulers,
 AS_HELP_STRING([--enable-dirty-schedulers], [enable dirty scheduler support]))
 
-AC_ARG_ENABLE(plain-emulator,
-AS_HELP_STRING([--enable-plain-emulator], [enable threaded non-smp emulator])
-AS_HELP_STRING([--disable-plain-emulator], [disable threaded non-smp emulator]))
-
 AC_ARG_WITH(termcap,
 AS_HELP_STRING([--with-termcap], [use termcap (default)])
 AS_HELP_STRING([--without-termcap],
diff --git a/otp_build b/otp_build
index 7b35b39fc2..284da63893 100755
--- a/otp_build
+++ b/otp_build
@@ -1001,8 +1001,7 @@ do_tests ()
 do_debuginfo_win32 ()
 {
     setup_make
-    (cd erts/emulator && $MAKE MAKE="$MAKE" TARGET=$TARGET FLAVOR=smp debug &&\
-	$MAKE MAKE="$MAKE" TARGET=$TARGET FLAVOR=plain debug) || exit 1
+    (cd erts/emulator && $MAKE MAKE="$MAKE" TARGET=$TARGET debug) || exit 1
     if [ -z "$1" ]; then
 	RELDIR="$ERL_TOP/release/$TARGET"
     else
@@ -1010,7 +1009,7 @@ do_debuginfo_win32 ()
     fi
     BINDIR="$ERL_TOP/bin/$TARGET"
     EVSN=`grep '^VSN' erts/vsn.mk | sed 's,^VSN.*=[^0-9]*$[0-9].*$$,@\1,g;s,^[^@].*,,g;s,^@,,g'`
-    for f in beam.debug.smp.dll beam.smp.pdb beam.debug.smp.dll.pdb erl.pdb werl.pdb erlexec.pdb; do
+    for f in beam.debug.smp.dll beam.smp.pdb beam.debug.smp.dll.pdb erl.pdb erlexec.pdb; do
 	if [ -f $BINDIR/$f ]; then
 	    rm -f $RELDIR/erts-$EVSN/bin/$f
 	    cp $BINDIR/$f $RELDIR/erts-$EVSN/bin/$f
@@ -1218,7 +1217,7 @@ case "$1" in
 		do_configure "$@";;
 	opt)
 		do_boot;;
-	plain|smp)
+	smp)
 		if [ $minus_x_flag = false ]; then
 		    TYPE=opt
 		fi;
-- 
2.35.3

Places

File 0525-erts-Fix-building-of-debuginfo-on-windows.patch of Package erlang (Revision 0c95bdcb413813ad538c04f6e313b575)

Places