|
|
@ -58,14 +58,15 @@ endif |
|
|
# Architecture #
|
|
|
# Architecture #
|
|
|
################
|
|
|
################
|
|
|
|
|
|
|
|
|
# To build on AMD64 or Itanium machines, ARCH should be set.
|
|
|
|
|
|
# We attempt to auto-detect this here.
|
|
|
|
|
|
|
|
|
# For Linux, we use uname to see if we are on a 64-bit (AMD64 or Itanium) machine
|
|
|
|
|
|
ifeq ($(OSTYPE),linux) |
|
|
ifneq (,$(findstring 86_64, $(shell uname -m))) |
|
|
ifneq (,$(findstring 86_64, $(shell uname -m))) |
|
|
ARCH = amd64 |
|
|
ARCH = amd64 |
|
|
endif |
|
|
endif |
|
|
ifneq (,$(findstring ia64, $(shell uname -m))) |
|
|
ifneq (,$(findstring ia64, $(shell uname -m))) |
|
|
ARCH = ia64 |
|
|
ARCH = ia64 |
|
|
endif |
|
|
endif |
|
|
|
|
|
endif |
|
|
# For Mac/Windows, we decide whether to build in 64-bit mode based on
|
|
|
# For Mac/Windows, we decide whether to build in 64-bit mode based on
|
|
|
# whether java is 32/64-bit (since these need to match)
|
|
|
# whether java is 32/64-bit (since these need to match)
|
|
|
ifeq ($(OSTYPE),darwin) |
|
|
ifeq ($(OSTYPE),darwin) |
|
|
|