Mercurial > mxe-octave

changeset 4812:053df833176d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/build-gcc.mk: disable win32 install when 64bit, dont create lib32/64 symlinks
author John Donoghue
date Wed, 22 Aug 2018 15:44:15 -0400
parents 2199acff25f8
children 6ef958afc65d
files src/build-gcc.mk
diffstat 1 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/build-gcc.mk	Wed Aug 22 13:15:15 2018 -0400
+++ b/src/build-gcc.mk	Wed Aug 22 15:44:15 2018 -0400
@@ -41,12 +41,6 @@
     define $(PKG)_PRE_BUILD
       echo "Shortcuts"
       # create shortcuts
-      if ! [ -L $(HOST_PREFIX)/lib64 ]; then \
-        ln -s $(HOST_PREFIX)/lib $(HOST_PREFIX)/lib64; \
-      fi
-      if ! [ -d $(HOST_PREFIX)/lib32 ]; then \
-        mkdir -p $(HOST_PREFIX)/lib32; \
-      fi
       if ! [ -L $(BUILD_TOOLS_PREFIX)/mingw ]; then \
         ln -s $(HOST_PREFIX) $(BUILD_TOOLS_PREFIX)/mingw; \
       fi
@@ -76,6 +70,7 @@
     cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \
 	--host='$(TARGET)' \
 	--prefix='$(HOST_PREFIX)' \
+	$(if $(filter $(TARGET), x86_64-w64-mingw32),--disable-lib32) \
 	--with-sysroot='$(HOST_PREFIX)'
     $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)'
     $(MAKE) -C '$(1).crt-build' -j 1 install
@@ -102,7 +97,7 @@
 
   ifeq ($(ENABLE_WINDOWS_64),yes)
     $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
-      --enable-64bit --enable-fully-dynamic-string
+      --enable-64bit --disable-32bit --enable-fully-dynamic-string
   endif
 else
   $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
@@ -156,7 +151,6 @@
     mv $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/lib32/libgcc_s.a $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/32/libgcc_s.a; \
   fi
 
-
   # create pkg-config script
   if [ '$(MXE_NATIVE_BUILD)' = 'no' ]; then \
     (echo '#!/bin/sh'; \