Mercurial > mxe-octave
diff src/termcap.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/termcap.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/termcap.mk Sun Jun 09 09:48:08 2013 -0400 @@ -20,11 +20,11 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - AR=$(TARGET)-ar + AR=$(MXE_AR) - $(MAKE) AR=$(TARGET)-ar -C '$(1)' -j '$(JOBS)' install + $(MAKE) AR=$(MXE_AR) -C '$(1)' -j '$(JOBS)' install if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(HOST_LIBDIR)/libtermcap.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(HOST_LIBDIR)/libtermcap.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi endef