diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-17 15:52:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-17 15:52:09 -0800 |
| commit | 75220495d023cf71d4b70837b58b814c074dfd90 (patch) | |
| tree | 123fd04366ef952463bdba3beb5fab487f5e6406 | |
| parent | 81b55adc0c4845163d3d816cc23a4db859feaba8 (diff) | |
| parent | 766a2a2125d41e8bfb88112601a34af08f47f7f1 (diff) | |
| download | build-75220495d023cf71d4b70837b58b814c074dfd90.zip build-75220495d023cf71d4b70837b58b814c074dfd90.tar.gz build-75220495d023cf71d4b70837b58b814c074dfd90.tar.bz2 | |
am 766a2a21: am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
* commit '766a2a2125d41e8bfb88112601a34af08f47f7f1':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index f0eb209..1189ff4 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -25,7 +25,9 @@ TARGET_AR := $(HOST_AR) TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32 TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 -lpthread TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS) +ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := x86 +endif else #simulator # Provide a default variant. |