Mercurial > mxe-octave

diff src/vmime.mk @ 3031:951da75fd09c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve handling of cross tool prefix
author John W. Eaton <jwe@octave.org>
date Sun, 09 Jun 2013 09:48:08 -0400
parents b6c7244a2f66
children 5ef49fb3299d
line wrap: on
line diff
--- a/src/vmime.mk	Sat Jun 08 20:53:29 2013 -0400
+++ b/src/vmime.mk	Sun Jun 09 09:48:08 2013 -0400
@@ -18,8 +18,8 @@
 define $(PKG)_BUILD
     cd '$(1)' && cmake \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-        -DCMAKE_AR='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ar' \
-        -DCMAKE_RANLIB='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ranlib' \
+        -DCMAKE_AR='$(MXE_AR)' \
+        -DCMAKE_RANLIB='$(MXE_RANLIB)' \
         .
 
     # Disable VMIME_HAVE_MLANG_H
@@ -31,8 +31,8 @@
     $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(HOST_INCDIR)/vmime/'
 
     $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp'
-    $(TARGET)-g++ -s -o '$(1)/examples/test-vmime.exe' \
+    $(MXE_CXX) -s -o '$(1)/examples/test-vmime.exe' \
         '$(1)/examples/example6.cpp' \
-        `'$(TARGET)-pkg-config' libvmime --cflags --libs`
+        `'$(MXE_PKG_CONFIG)' libvmime --cflags --libs`
     $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(HOST_BINDIR)'
 endef