fix #3242 by passing gcc -dumpmachine to all configure scripts, inste…

…ad of allowing autodetection with config.guess
JuliaLang · Jun 10, 2013 · f2b52a0 · f2b52a0
1 parent 14fc2a2
commit f2b52a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1,520 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -12,10 +12,9 @@ BUILD_LLDB = 0
 
 JULIAHOME = $(abspath ..)
 include $(JULIAHOME)/Make.inc
-CONFIGURE_COMMON = --prefix=$(abspath $(BUILD)) F77="$(FC)" CC="$(CC)" CXX="$(CXX)"
+CONFIGURE_COMMON = --prefix=$(abspath $(BUILD)) F77="$(FC)" CC="$(CC)" CXX="$(CXX)" --build=$(BUILD_MACHINE)
 ifneq ($(XC_HOST),)
-CONFIG_GUESS := $(shell ./config.guess)
-CONFIGURE_COMMON += --host=$(XC_HOST) --build=$(CONFIG_GUESS)
+CONFIGURE_COMMON += --host=$(XC_HOST)
 endif
 ifeq ($(OS),WINNT)
 CONFIGURE_COMMON += LDFLAGS=-Wl,--stack,8388608
@@ -681,14 +680,14 @@ endif
 
 ifneq ($(BUILD_OS),$(OS))
 OPENBLAS_BUILD_OPTS += OSNAME=$(OS) CROSS=1 HOSTCC=gcc
+endif
 ifeq ($(ARCH),i686)
 OPENBLAS_BUILD_OPTS += BINARY=32
 else ifeq ($(ARCH),x86_64)
 OPENBLAS_BUILD_OPTS += BINARY=64
 else
 $(error "unknown arch for openblas cross-compile")
 endif
-endif
 
 openblas-$(OPENBLAS_VER).tar.gz:
 	$(WGET_DASH_O) $@ https://github.com/xianyi/OpenBLAS/tarball/$(OPENBLAS_VER)