# HG changeset patch # User John Donoghue # Date 1370731923 14400 # Node ID d024ce7bdaf0a00049e5d6651d665fae5a307616 # Parent 316b79f1a41b5b044c7744d9761f62254448da13 Update pthread for native mingw build * src/pthreads.mk: added new build rule for native mingw diff -r 316b79f1a41b -r d024ce7bdaf0 src/pthreads.mk --- a/src/pthreads.mk Sat Jun 08 18:50:44 2013 -0400 +++ b/src/pthreads.mk Sat Jun 08 18:52:03 2013 -0400 @@ -14,6 +14,23 @@ $(SED) -n 's/^#define PTW32_VERSION \([^,]*\),\([^,]*\),\([^,]*\),.*/\1-\2-\3/p;' endef +ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) +define $(PKG)_BUILD + $(MAKE) -C '$(1)' -j 1 GC-static + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libpthreadGC2.a' '$(HOST_LIBDIR)/libpthread.a' + + if [ $(BUILD_SHARED) = yes ]; then \ + $(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)' + $(INSTALL) -m644 '$(1)/pthread.h' '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/sched.h' '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/semaphore.h' '$(HOST_INCDIR)' +endef + +else ifeq ($(MXE_SYSTEM),mingw) define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 GC-static CROSS='$(TARGET)-' @@ -33,3 +50,4 @@ define $(PKG)_BUILD endef endif +endif