Mercurial > mxe-octave

diff src/pthreads.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 d024ce7bdaf0
children 5ef49fb3299d
line wrap: on
line diff
--- a/src/pthreads.mk	Sat Jun 08 20:53:29 2013 -0400
+++ b/src/pthreads.mk	Sun Jun 09 09:48:08 2013 -0400
@@ -33,12 +33,12 @@
 else
 ifeq ($(MXE_SYSTEM),mingw)
 define $(PKG)_BUILD
-    $(MAKE) -C '$(1)' -j 1 GC-static CROSS='$(TARGET)-'
+    $(MAKE) -C '$(1)' -j 1 GC-static CROSS='$(MXE_TOOL_PREFIX)'
     $(INSTALL) -d '$(HOST_LIBDIR)'
     $(INSTALL) -m644 '$(1)/libpthreadGC2.a' '$(HOST_LIBDIR)/libpthread.a'
 
     if [ $(BUILD_SHARED) = yes ]; then \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(HOST_LIBDIR)/libpthread.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(HOST_LIBDIR)/libpthread.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \
     fi
 
     $(INSTALL) -d '$(HOST_INCDIR)'