diff options
| author | Tony Theodore <tonyt@logyst.com> | 2010-09-26 15:25:24 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2010-09-26 15:25:24 (GMT) |
| commit | 6def82501523203f8dff783e31adcfc911eafa51 (patch) | |
| tree | d08f26541cd85fe9b556e636331768fdf4da0a77 /src/glib.mk | |
| parent | 714a12ab02e5c7d93ad1fa29ab14ead2b0e05a4c (diff) | |
| download | mxe-6def82501523203f8dff783e31adcfc911eafa51.zip mxe-6def82501523203f8dff783e31adcfc911eafa51.tar.gz mxe-6def82501523203f8dff783e31adcfc911eafa51.tar.bz2 | |
rollback previous commit
Diffstat (limited to 'src/glib.mk')
| -rw-r--r-- | src/glib.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/glib.mk b/src/glib.mk index ddb9d52..be527f4 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -31,8 +31,7 @@ define $(PKG)_BUILD cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv) cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \ --disable-shared \ - --disable-nls \ - $(OSX_CC_ENV) + --disable-nls $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)' # native build for glib-genmarshal, without pkg-config, gettext and zlib @@ -48,8 +47,7 @@ define $(PKG)_BUILD --with-libiconv=gnu \ --with-pcre=internal \ CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \ - LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' \ - $(OSX_CC_ENV) + LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h' $(MAKE) -C '$(1).native/glib' -j '$(JOBS)' $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)' |