Mercurial > mxe-octave
comparison src/build-gcc.mk @ 3523:1b350761007f
allow native-gcc build to succeed
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 16 Feb 2014 17:49:33 -0500 |
parents | 2aaa6f511434 |
children | bff3dfa5c343 |
comparison
equal
deleted
inserted
replaced
3522:9bc3862c2091 | 3523:1b350761007f |
---|---|
27 --with-gnu-ld \ | 27 --with-gnu-ld \ |
28 --with-gnu-as \ | 28 --with-gnu-as \ |
29 --disable-nls \ | 29 --disable-nls \ |
30 --without-x \ | 30 --without-x \ |
31 --disable-win32-registry \ | 31 --disable-win32-registry \ |
32 --enable-threads=win32 | 32 --enable-threads=win32 \ |
33 --with-native-system-header-dir='/include' | |
33 ifneq ($(ENABLE_64),yes) | 34 ifneq ($(ENABLE_64),yes) |
34 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ | 35 $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \ |
35 --disable-sjlj-exceptions | 36 --disable-sjlj-exceptions |
36 endif | 37 endif |
37 endif | 38 endif |
57 --target='$(TARGET)' \ | 58 --target='$(TARGET)' \ |
58 --build='$(BUILD_SYSTEM)' \ | 59 --build='$(BUILD_SYSTEM)' \ |
59 --prefix='$(BUILD_TOOLS_PREFIX)' \ | 60 --prefix='$(BUILD_TOOLS_PREFIX)' \ |
60 --enable-languages='c,c++,fortran' \ | 61 --enable-languages='c,c++,fortran' \ |
61 --disable-multilib \ | 62 --disable-multilib \ |
63 --with-sysroot='$(HOST_PREFIX)' \ | |
62 $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ | 64 $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ |
63 $(ENABLE_SHARED_OR_STATIC) \ | 65 $(ENABLE_SHARED_OR_STATIC) \ |
64 --disable-libgomp \ | 66 --disable-libgomp \ |
65 --disable-libmudflap \ | 67 --disable-libmudflap \ |
66 --with-cloog='$(BUILD_TOOLS_PREFIX)' \ | 68 --with-cloog='$(BUILD_TOOLS_PREFIX)' \ |
83 # build mingw-w64-crt | 85 # build mingw-w64-crt |
84 cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,mingw-w64,$(TAR)) | 86 cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,mingw-w64,$(TAR)) |
85 mkdir '$(1).crt-build' | 87 mkdir '$(1).crt-build' |
86 cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \ | 88 cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \ |
87 --host='$(TARGET)' \ | 89 --host='$(TARGET)' \ |
88 --prefix='$(HOST_PREFIX)' | 90 --prefix='$(HOST_PREFIX)' \ |
91 --with-sysroot='$(HOST_PREFIX)' \ | |
92 $(ENABLE_SHARED_OR_STATIC) | |
89 $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' | 93 $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' |
90 $(MAKE) -C '$(1).crt-build' -j 1 install | 94 $(MAKE) -C '$(1).crt-build' -j 1 install |
91 | 95 |
92 # build rest of gcc | 96 # build rest of gcc |
93 cd '$(1).build' | 97 cd '$(1).build' |