Mercurial > mxe-octave
diff src/pdcurses.mk @ 3031:951da75fd09c
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/pdcurses.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/pdcurses.mk Sun Jun 09 09:48:08 2013 -0400 @@ -18,17 +18,17 @@ define $(PKG)_BUILD $(SED) -i 's,copy,cp,' '$(1)/win32/mingwin32.mak' $(MAKE) -C '$(1)' -j '$(JOBS)' libs -f '$(1)/win32/mingwin32.mak' \ - CC='$(TARGET)-gcc' \ - LIBEXE='$(TARGET)-ar' \ + CC='$(MXE_CC)' \ + LIBEXE='$(MXE_AR)' \ DLL=N \ PDCURSES_SRCDIR=. \ WIDE=Y \ UTF8=Y mv '$(1)/pdcurses.a' '$(1)/libcurses.a' - $(TARGET)-ranlib '$(1)/libcurses.a' '$(1)/panel.a' + $(MXE_RANLIB) '$(1)/libcurses.a' '$(1)/panel.a' if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libcurses.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/panel.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libcurses.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/panel.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi if [ "$(BUILD_STATIC)" = yes ]; then \ $(INSTALL) -m644 '$(1)/libcurses.a' '$(HOST_LIBDIR)/libcurses.a'