make/common/shared/Platform.gmk

changeset 354
c6c0b1047985
parent 340
f7718662741d
child 366
a1f721fbe5d0
equal deleted inserted replaced
348:0feb9b8a9538 354:c6c0b1047985
1 # 1 #
2 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. Oracle designates this 7 # published by the Free Software Foundation. Oracle designates this
273 ;; \ 273 ;; \
274 sparc*) \ 274 sparc*) \
275 echo sparc \ 275 echo sparc \
276 ;; \ 276 ;; \
277 x86_64) \ 277 x86_64) \
278 echo amd64 \ 278 echo x86_64 \
279 ;; \ 279 ;; \
280 "Power Macintosh") \ 280 "Power Macintosh") \
281 echo ppc \ 281 echo ppc \
282 ;; \ 282 ;; \
283 *) \ 283 *) \
285 ;; \ 285 ;; \
286 esac 286 esac
287 ARCH := $(shell $(archExpr) ) 287 ARCH := $(shell $(archExpr) )
288 ARCH_FAMILY := $(ARCH) 288 ARCH_FAMILY := $(ARCH)
289 289
290 # Darwin x86 builds are i386/amd64 universal. 290 # Darwin builds are currently universal but only include 64-bit
291 ifeq ($(SYSTEM_UNAME), Darwin) 291 #
292 ifneq ($(ARCH), ppc) 292 # ifeq ($(SYSTEM_UNAME), Darwin)
293 ARCH=universal 293 # ifneq ($(ARCH), ppc)
294 endif 294 # ARCH=universal
295 endif 295 # endif
296 # endif
296 297
297 # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64 298 # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
298 ifneq (,$(findstring $(ARCH), i586 sparc ppc universal)) 299 ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
299 ARCH_DATA_MODEL=32 300 ARCH_DATA_MODEL=32
300 else 301 else

mercurial