From b06795b831a710478b345fff4682064888fd9ee2 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 16 Nov 2014 19:58:52 -0500 Subject: Add a $(BITS) convenience variable Signed-off-by: Timothy Gu --- Makefile | 1 + src/luajit.mk | 7 ++----- src/openblas.mk | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 914a21f..7352df6 100644 --- a/Makefile +++ b/Makefile @@ -416,6 +416,7 @@ build-only-$(1)_$(3): PKG = $(1) build-only-$(1)_$(3): TARGET = $(3) build-only-$(1)_$(3): BUILD_$(if $(findstring shared,$(3)),SHARED,STATIC) = TRUE build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a) +build-only-$(1)_$(3): BITS = $(if $(findstring x86_64,$(3)),64,32) build-only-$(1)_$(3): CMAKE_TOOLCHAIN_FILE = $(PREFIX)/$(3)/share/cmake/mxe-conf.cmake build-only-$(1)_$(3): $(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))), diff --git a/src/luajit.mk b/src/luajit.mk index 1dc5b87..d71342c 100644 --- a/src/luajit.mk +++ b/src/luajit.mk @@ -12,7 +12,7 @@ $(PKG)_DEPS := gcc define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' \ - HOST_CC='gcc -m32' CROSS='$(TARGET)-' \ + HOST_CC='gcc -m$(BITS)' CROSS='$(TARGET)-' \ TARGET_SYS=Windows BUILDMODE=static \ PREFIX='$(PREFIX)/$(TARGET)' \ FILE_T=luajit.exe \ @@ -20,10 +20,7 @@ define $(PKG)_BUILD endef # gcc -m64 is only available on 64-bit machines -ifneq (,$(findstring 64,$(BUILD))) - $(PKG)_BUILD_x86_64-w64-mingw32 = \ - $(subst 'gcc -m32','gcc -m64',$($(PKG)_BUILD)) -else +ifeq (,$(findstring 64,$(BUILD))) $(PKG)_BUILD_x86_64-w64-mingw32 = endif diff --git a/src/openblas.mk b/src/openblas.mk index bfdafd6..1583ab0 100644 --- a/src/openblas.mk +++ b/src/openblas.mk @@ -35,7 +35,7 @@ $(PKG)_MAKE_OPTS = \ ARCH=$(strip \ $(if $(findstring x86_64,$(TARGET)),x86_64,\ $(if $(findstring i686,$(TARGET)),x86)) \ - BINARY=$(if $(findstring x86_64,$(TARGET)),64,32)) \ + BINARY=$(BITS) \ $(if $(BUILD_STATIC),NO_SHARED=1) \ $(if $(BUILD_SHARED),NO_STATIC=1) \ EXTRALIB="`'$(TARGET)-pkg-config' --libs pthreads` -fopenmp" -- cgit v0.12