comparison make/pic.make @ 6643:1eb74cd5994b

Merge
author jiangli
date Fri, 31 Aug 2012 12:59:10 -0700
parents 0771839a29ab
children
comparison
equal deleted inserted replaced
6637:4d318b1e73ca 6643:1eb74cd5994b
30 30
31 ifneq ($(OSNAME), windows) 31 ifneq ($(OSNAME), windows)
32 ifndef LP64 32 ifndef LP64
33 PARTIAL_NONPIC=1 33 PARTIAL_NONPIC=1
34 endif 34 endif
35 PIC_ARCH = ppc 35 PIC_ARCH = ppc arm
36 ifneq ("$(filter $(PIC_ARCH),$(BUILDARCH))","") 36 ifneq ("$(filter $(PIC_ARCH),$(BUILDARCH))","")
37 PARTIAL_NONPIC=0 37 PARTIAL_NONPIC=0
38 endif 38 endif
39 ifeq ($(PARTIAL_NONPIC),1) 39 ifeq ($(PARTIAL_NONPIC),1)
40 NONPIC_DIRS = memory oops gc_implementation gc_interface 40 NONPIC_DIRS = memory oops gc_implementation gc_interface