diff options
| author | Grace Kloba <klobag@google.com> | 2009-07-06 10:19:33 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-07-06 10:19:33 -0700 |
| commit | 5640a5e3f899e84b1c58f2ec9bd1b3dd6bf456cd (patch) | |
| tree | 605ab299e8599dbbdae59fe41adca4d6ec6cd8f3 /V8Binding | |
| parent | 3f84acc12c5a694d9c4073aa1de33fbdf1cd22d1 (diff) | |
| download | external_webkit-5640a5e3f899e84b1c58f2ec9bd1b3dd6bf456cd.zip external_webkit-5640a5e3f899e84b1c58f2ec9bd1b3dd6bf456cd.tar.gz external_webkit-5640a5e3f899e84b1c58f2ec9bd1b3dd6bf456cd.tar.bz2 | |
Fix Mac build of mksnapshot
mksnapshot is a host program and it is platform dependent. Add rules to Makefiles so that it picks up the right file depending on the host platform.
Diffstat (limited to 'V8Binding')
| -rw-r--r-- | V8Binding/Android.libv8.mk | 5 | ||||
| -rw-r--r-- | V8Binding/Android.mksnapshot.mk | 20 | ||||
| -rw-r--r-- | V8Binding/Android.v8common.mk | 5 |
3 files changed, 22 insertions, 8 deletions
diff --git a/V8Binding/Android.libv8.mk b/V8Binding/Android.libv8.mk index f85ba79..3bb348e 100644 --- a/V8Binding/Android.libv8.mk +++ b/V8Binding/Android.libv8.mk @@ -15,6 +15,11 @@ V8_LOCAL_SRC_FILES := V8_LOCAL_JS_LIBRARY_FILES := include $(LOCAL_PATH)/Android.v8common.mk +# Target can only be linux +V8_LOCAL_SRC_FILES += \ + src/platform-linux.cc \ + src/platform-posix.cc + LOCAL_SRC_FILES := $(addprefix v8/, $(V8_LOCAL_SRC_FILES)) LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/v8/, $(V8_LOCAL_JS_LIBRARY_FILES)) diff --git a/V8Binding/Android.mksnapshot.mk b/V8Binding/Android.mksnapshot.mk index ef18196..235f509 100644 --- a/V8Binding/Android.mksnapshot.mk +++ b/V8Binding/Android.mksnapshot.mk @@ -14,11 +14,23 @@ V8_LOCAL_SRC_FILES := V8_LOCAL_JS_LIBRARY_FILES := include $(LOCAL_PATH)/Android.v8common.mk +V8_LOCAL_SRC_FILES += \ + src/mksnapshot.cc \ + src/arm/simulator-arm.cc \ + src/snapshot-empty.cc + +ifeq ($(HOST_OS),linux) +V8_LOCAL_SRC_FILES += \ + src/platform-linux.cc \ + src/platform-posix.cc +endif +ifeq ($(HOST_OS),darwin) +V8_LOCAL_SRC_FILES += \ + src/platform-macos.cc \ + src/platform-posix.cc +endif + LOCAL_SRC_FILES := $(addprefix v8/, $(V8_LOCAL_SRC_FILES)) -LOCAL_SRC_FILES += \ - v8/src/mksnapshot.cc \ - v8/src/arm/simulator-arm.cc \ - v8/src/snapshot-empty.cc LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/v8/, $(V8_LOCAL_JS_LIBRARY_FILES)) diff --git a/V8Binding/Android.v8common.mk b/V8Binding/Android.v8common.mk index b75cdf2..bf2e796 100644 --- a/V8Binding/Android.v8common.mk +++ b/V8Binding/Android.v8common.mk @@ -64,10 +64,7 @@ V8_LOCAL_SRC_FILES := \ src/variables.cc \ src/virtual-frame.cc \ src/version.cc \ - src/zone.cc \ - \ - src/platform-linux.cc \ - src/platform-posix.cc + src/zone.cc ifeq ($(TARGET_ARCH),arm) V8_LOCAL_SRC_FILES += \ |