[m-rev.] diff: temporarily disable the use of depend_ints on MinGW64

Julien Fischer jfischer at opturion.com
Tue Oct 24 21:11:24 AEDT 2023


Temporarily disable the use of depend_ints on MinGW64.

library/MmakeFile:
compiler/Mmakefile:
    As above.

diff --git a/compiler/Mmakefile b/compiler/Mmakefile
index d67c9f6..5ecd9f2 100644
--- a/compiler/Mmakefile
+++ b/compiler/Mmakefile
@@ -84,8 +84,16 @@ endif
  # Specify the name of the top-level module to build.
  MC_PROG = mercury_compile

+# XXX Don't use depend_ints on Windows as it is very slow on that platform.
+#
+ifneq ("$(findstring x86_64-w64-mingw32,$(FULLARCH))","")
+DEPEND_TARGET=depend
+else
+DEPEND_TARGET=depend_ints
+endif
+
  .PHONY: depend
-depend:		$(MC_PROG).depend_ints
+depend:		$(MC_PROG).$(DEPEND_TARGET)

  $(MC_PROG).depend:      Mercury.modules COMP_FLAGS
  $(MC_PROG).depend_ints: Mercury.modules COMP_FLAGS
diff --git a/library/Mmakefile b/library/Mmakefile
index e2ebe87..7d5af68 100644
--- a/library/Mmakefile
+++ b/library/Mmakefile
@@ -2,6 +2,7 @@
  # vim: ts=8 sw=8 noexpandtab ft=make
  #-----------------------------------------------------------------------------#
  # Copyright (C) 1997-2012 The University of Melbourne.
+# Copyright (C) 2013-2017, 2019-2023 The Mercury team.
  # This file may only be copied under the terms of the GNU General
  # Public License - see the file COPYING in the Mercury distribution.
  #-----------------------------------------------------------------------------#
@@ -187,8 +188,16 @@ mercury: lib_std

  #-----------------------------------------------------------------------------#

+# XXX Don't use depend_ints on Windows as it is very slow on that platform.
+#
+ifneq ("$(findstring x86_64-w64-mingw32,$(FULLARCH))","")
+DEPEND_TARGET=depend
+else
+DEPEND_TARGET=depend_ints
+endif
+
  .PHONY: depend
-depend:	LIB_FLAGS getopt.m copy_java_runtime_files $(STD_LIB_NAME).depend_ints
+depend:	LIB_FLAGS getopt.m copy_java_runtime_files $(STD_LIB_NAME).$(DEPEND_TARGET)

  .PHONY: check
  check:	$(STD_LIB_NAME).check


More information about the reviews mailing list