Mercurial > mxe-octave

diff src/glib.mk @ 1200:d516fda09eef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use the more recent gcc42 on OSX
author Tony Theodore <tonyt@logyst.com>
date Mon, 27 Sep 2010 01:12:56 +1000
parents 40fff8072354
children fca60b5b5afb
line wrap: on
line diff
--- a/src/glib.mk	Sun Sep 26 16:51:42 2010 +0200
+++ b/src/glib.mk	Mon Sep 27 01:12:56 2010 +1000
@@ -31,7 +31,8 @@
     cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv)
     cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \
         --disable-shared \
-        --disable-nls
+        --disable-nls \
+        $(OSX_CC_ENV)
     $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)'
 
     # native build for glib-genmarshal, without pkg-config, gettext and zlib
@@ -47,7 +48,8 @@
         --with-libiconv=gnu \
         --with-pcre=internal \
         CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \
-        LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs'
+        LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' \
+        $(OSX_CC_ENV)
     $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h'
     $(MAKE) -C '$(1).native/glib'    -j '$(JOBS)'
     $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)'