# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1375810226 14400
# Node ID 96f2ec8172a15b4fe9a69f34d61e13e05fb2a32f
# Parent  a940dce608414276a81ceaece51f9a3ed91a8473
always set libdir and disable multilib for gcc build

diff -r a940dce60841 -r 96f2ec8172a1 src/build-gcc.mk
--- a/src/build-gcc.mk	Tue Aug 06 13:30:03 2013 -0400
+++ b/src/build-gcc.mk	Tue Aug 06 13:30:26 2013 -0400
@@ -22,7 +22,6 @@
 
 ifeq ($(MXE_SYSTEM),mingw)
   $(PKG)_SYSDEP_CONFIGURE_OPTIONS := \
-    --libdir='$(BUILD_TOOLS_PREFIX)/lib' \
     --enable-version-specific-runtime-libs \
     --with-gcc \
     --with-gnu-ld \
@@ -49,7 +48,9 @@
         --target='$(TARGET)' \
         --build='$(BUILD_SYSTEM)' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
+        --libdir='$(BUILD_TOOLS_PREFIX)/lib' \
         --enable-languages='c,c++,fortran' \
+        --disable-multilib \
         $(ENABLE_SHARED_OR_STATIC) \
         $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
         --disable-libgomp \