[gobject-introspection] Windows port: Work arount MSYS weirdness where it changes --libtool= command line arguments.
- From: Dieter Verfaillie <dieterv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Windows port: Work arount MSYS weirdness where it changes --libtool= command line arguments.
- Date: Wed, 7 Sep 2011 19:41:34 +0000 (UTC)
commit 33bbdce144d275b693752f0bc2c2f292deda854e
Author: Dieter Verfaillie <dieterv optionexplicit be>
Date: Mon Sep 5 17:39:40 2011 +0200
Windows port: Work arount MSYS weirdness where it changes --libtool= command line arguments.
This continues to reuse the LIBTOOL variable from automake if it's set,
but works around some MSYS weirdness: When running g-ir-scanner, MSYS
changes a command-line argument --libtool="/bin/sh ../../libtool" into
--libtool=c:/opt/msys/1.0/bin/libtool. So just use sh.exe without path
because we already "know" where the libtool configure produced is.
https://bugzilla.gnome.org/show_bug.cgi?id=620566
Makefile.introspection | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.introspection b/Makefile.introspection
index 4b70e3c..a0764ac 100644
--- a/Makefile.introspection
+++ b/Makefile.introspection
@@ -62,8 +62,12 @@ _gir_packages = $(foreach pkg,$($(_gir_name)_PACKAGES),--pkg=$(pkg))
_gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
_gir_export_packages = $(foreach pkg,$($(_gir_name)_EXPORT_PACKAGES),--pkg-export=$(pkg))
-# Reuse the LIBTOOL variable from by automake if it's set
-_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
+# Reuse the LIBTOOL variable from automake if it's set, but
+# work around MSYS weirdness: When running g-ir-scanner, MSYS changes
+# a command-line argument --libtool="/bin/sh ../../libtool" into
+# --libtool=c:/opt/msys/1.0/bin/libtool. So just use sh.exe without path
+# because we already "know" where the libtool configure produced is.
+_gir_libtool = $(if $(findstring MINGW32,$(shell uname -s)),--libtool="$(top_builddir)/libtool",$(if $(LIBTOOL),--libtool="$(LIBTOOL)"))
# Macros for AM_SILENT_RULES prettiness
_gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]