diff options
Diffstat (limited to 'src/gcc.mk')
-rw-r--r-- | src/gcc.mk | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -4,8 +4,8 @@ # GCC PKG := gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 4.6.0 -$(PKG)_CHECKSUM := dcbb5ce724c4bf87b9ec93473d16b71e9ebac483 +$(PKG)_VERSION := 4.6.1 +$(PKG)_CHECKSUM := 8bf66f7a71534ba564563a0ba0b2517aead8ac30 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://gcc.gnu.org/ @@ -34,6 +34,7 @@ define $(PKG)_BUILD cd '$(1).build' && '$(1)/configure' \ --target='$(TARGET)' \ --prefix='$(PREFIX)' \ + --libdir='$(PREFIX)/lib' \ --enable-languages='c,c++,objc,fortran' \ --enable-version-specific-runtime-libs \ --with-gcc \ @@ -46,7 +47,9 @@ define $(PKG)_BUILD --disable-win32-registry \ --enable-threads=win32 \ --disable-libgomp \ - --disable-libmudflap + --disable-libmudflap \ + --with-mpfr-include='$(1)/mpfr/src' \ + --with-mpfr-lib='$(1).build/mpfr/src/.libs' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install @@ -60,6 +63,7 @@ define $(PKG)_BUILD [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' (echo 'set(BUILD_SHARED_LIBS OFF)'; \ echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ + echo 'set(MSYS 1)'; \ echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ @@ -68,6 +72,7 @@ define $(PKG)_BUILD echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ + echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/bin/$(TARGET)-qmake)'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ > '$(CMAKE_TOOLCHAIN_FILE)' |