Mercurial > mxe-octave
changeset 2736:b28cc3e50c33
Merge branch 'master' of github.com:mxe/mxe
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Mon, 17 Sep 2012 20:08:47 +1000 |
| parents | e8d0224638b2 (diff) 485231b507aa (current diff) |
| children | 57ee697ed83b |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gcc.mk Tue Sep 11 22:34:40 2012 +0200 +++ b/src/gcc.mk Mon Sep 17 20:08:47 2012 +1000 @@ -47,7 +47,8 @@ --disable-libgomp \ --disable-libmudflap \ --with-mpfr-include='$(1)/mpfr/src' \ - --with-mpfr-lib='$(1).build/mpfr/src/.libs' + --with-mpfr-lib='$(1).build/mpfr/src/.libs' \ + $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install
--- a/src/openal.mk Tue Sep 11 22:34:40 2012 +0200 +++ b/src/openal.mk Mon Sep 17 20:08:47 2012 +1000 @@ -18,7 +18,8 @@ define $(PKG)_BUILD cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DLIBTYPE=STATIC + -DLIBTYPE=STATIC \ + -DEXAMPLES=FALSE $(MAKE) -C '$(1)/build' -j '$(JOBS)' install '$(TARGET)-gcc' \
--- a/src/portaudio.mk Tue Sep 11 22:34:40 2012 +0200 +++ b/src/portaudio.mk Mon Sep 17 20:08:47 2012 +1000 @@ -23,7 +23,8 @@ --prefix='$(PREFIX)/$(TARGET)' \ --with-host_os=mingw \ --with-winapi=wmme,directx,wasapi,wdmks \ - --with-dxdir=$(PREFIX)/$(TARGET) + --with-dxdir=$(PREFIX)/$(TARGET) \ + ac_cv_path_AR=$(TARGET)-ar $(MAKE) -C '$(1)' -j '$(JOBS)' SHARED_FLAGS= TESTS= $(MAKE) -C '$(1)' -j 1 install