[m-dev.] diff: disable demangling under cygwin

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 0.25
Branches: main, release

Demangling hangs under cygwin, so disable it under
cygwin.

configure.in:
scripts/parse_ml_options.sh-subr.in:
	Disable demangling under cygwin.


Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.412.2.2
diff -u -r1.412.2.2 configure.in
--- configure.in	23 Mar 2005 07:19:27 -0000	1.412.2.2
+++ configure.in	3 Aug 2005 18:39:25 -0000
@@ -3503,11 +3503,22 @@
 FINAL_GRADE_OPTIONS=$top/scripts/final_grade_options.sh-subr
 PARSE_ML_OPTIONS=$top/scripts/parse_ml_options.sh-subr
 CANONICAL_GRADE=$top/scripts/canonical_grade.sh-subr
+
+
+# demangling hangs on cygwin, so don't enable it.
+case "$host" in
+	*-cygwin*)
+		DEMANGLE=false ;;
+	*)
+		DEMANGLE=true ;;
+esac
+
 AC_SUBST_FILE(INIT_GRADE_OPTIONS)
 AC_SUBST_FILE(PARSE_GRADE_OPTIONS)
 AC_SUBST_FILE(FINAL_GRADE_OPTIONS)
 AC_SUBST_FILE(PARSE_ML_OPTIONS)
 AC_SUBST_FILE(CANONICAL_GRADE)
+AC_SUBST(DEMANGLE)
 
 # mercury_config includes configure.help to include the help for configure
 # in its `--help' output and man page.
Index: scripts/parse_ml_options.sh-subr.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/parse_ml_options.sh-subr.in,v
retrieving revision 1.8
diff -u -r1.8 parse_ml_options.sh-subr.in
--- scripts/parse_ml_options.sh-subr.in	10 Apr 2004 05:12:23 -0000	1.8
+++ scripts/parse_ml_options.sh-subr.in	3 Aug 2005 18:39:26 -0000
@@ -41,7 +41,7 @@
 esac
 mercury_libs=default
 all_libs=default
-demangle=true
+demangle=@DEMANGLE@
 make_shared_lib=false
 leave_shlib_dirs_relative=false
 user_shlib_dirs=""

--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------