Mercurial > mxe-octave
comparison src/build-gcc.mk @ 3224:ddb4cedc4289
build-gcc.mk: only set --libdir for mingw build
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 08 Aug 2013 12:05:03 -0400 |
parents | 8b10ade3efff |
children | 13be64f9f16d |
comparison
equal
deleted
inserted
replaced
3223:94339f5a27fe | 3224:ddb4cedc4289 |
---|---|
20 $(PKG)_STATIC_FLAG := --static | 20 $(PKG)_STATIC_FLAG := --static |
21 endif | 21 endif |
22 | 22 |
23 ifeq ($(MXE_SYSTEM),mingw) | 23 ifeq ($(MXE_SYSTEM),mingw) |
24 $(PKG)_SYSDEP_CONFIGURE_OPTIONS := \ | 24 $(PKG)_SYSDEP_CONFIGURE_OPTIONS := \ |
25 --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ | |
25 --enable-version-specific-runtime-libs \ | 26 --enable-version-specific-runtime-libs \ |
26 --with-gcc \ | 27 --with-gcc \ |
27 --with-gnu-ld \ | 28 --with-gnu-ld \ |
28 --with-gnu-as \ | 29 --with-gnu-as \ |
29 --disable-nls \ | 30 --disable-nls \ |
46 mkdir '$(1).build' | 47 mkdir '$(1).build' |
47 cd '$(1).build' && '$(1)/configure' \ | 48 cd '$(1).build' && '$(1)/configure' \ |
48 --target='$(TARGET)' \ | 49 --target='$(TARGET)' \ |
49 --build='$(BUILD_SYSTEM)' \ | 50 --build='$(BUILD_SYSTEM)' \ |
50 --prefix='$(BUILD_TOOLS_PREFIX)' \ | 51 --prefix='$(BUILD_TOOLS_PREFIX)' \ |
51 --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ | |
52 --enable-languages='c,c++,fortran' \ | 52 --enable-languages='c,c++,fortran' \ |
53 --disable-multilib \ | 53 --disable-multilib \ |
54 $(ENABLE_SHARED_OR_STATIC) \ | 54 $(ENABLE_SHARED_OR_STATIC) \ |
55 $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ | 55 $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ |
56 --disable-libgomp \ | 56 --disable-libgomp \ |