Mercurial > mxe-octave
changeset 3018:051574ceb3fc
Update Makefile for native mingw compiling so pkg-config knows where its pc files should be.
* Makefile:
added make variable MXE_NATIVE_MINGW_BUILD which is set to yes if doing a native build to a mingw system.
added PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig fornative mingw builds
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sat, 08 Jun 2013 09:48:20 -0400 |
| parents | 107fb7f1202f |
| children | d4c8aa885d1b |
| files | Makefile |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Jun 06 18:06:54 2013 -0400 +++ b/Makefile Sat Jun 08 09:48:20 2013 -0400 @@ -51,6 +51,13 @@ --host='$(TARGET)' --build='$(BUILD_SYSTEM)' endif +# are we doing a native mingw build ? +ifeq ($(MXE_NATIVE_BUILD),yes) + ifeq ($(MXE_SYSTEM),mingw) + MXE_NATIVE_MINGW_BUILD := yes + endif +endif + # These can't be chosen arbitrarily. The way things are configured now, # GCC expects to find cross-compiler include files in $(PREFIX)/$(TARGET). # and it's not clear to me how to change that. @@ -188,6 +195,11 @@ unexport EXTRA_LDFLAGS LD LDFLAGS LIBRARY_PATH LIBS NM unexport OBJC_INCLUDE_PATH PKG_CONFIG QMAKESPEC RANLIB STRIP +# mingw on windows ignores the compiled in pc-path so we need to tell pkg-config where it is +ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) + export PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' +endif + SHORT_PKG_VERSION = \ $(word 1,$(subst ., ,$($(1)_VERSION))).$(word 2,$(subst ., ,$($(1)_VERSION)))