Mercurial > mxe-octave

diff src/libmikmod.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/libmikmod.mk	Sat Jun 08 20:53:29 2013 -0400
+++ b/src/libmikmod.mk	Sun Jun 09 09:48:08 2013 -0400
@@ -19,10 +19,10 @@
     $(SED) -i 's,-Dunix,,' '$(1)/libmikmod/Makefile.in'
     $(SED) -i 's,`uname`,MinGW,g' '$(1)/configure'
     cd '$(1)' && \
-        CC='$(TARGET)-gcc' \
-        NM='$(TARGET)-nm' \
-        RANLIB='$(TARGET)-ranlib' \
-        STRIP='$(TARGET)-strip' \
+        CC='$(MXE_CC)' \
+        NM='$(MXE_NM)' \
+        RANLIB='$(MXE_RANLIB)' \
+        STRIP='$(MXE_STRIP)' \
         ./configure \
             $(ENABLE_SHARED_OR_STATIC) \
             --prefix='$(HOST_PREFIX)' \
@@ -30,7 +30,7 @@
             --disable-esd
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
-    '$(TARGET)-gcc' \
+    '$(MXE_CC)' \
         -W -Wall -Werror -std=c99 -pedantic \
         '$(2).c' -o '$(HOST_BINDIR)/test-libmikmod.exe' \
         `'$(HOST_BINDIR)/libmikmod-config' --cflags --libs`