summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/JavaScriptCore.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
commit8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch)
tree17985605dab9263cc2444bd4d45f189e142cca7c /Source/JavaScriptCore/JavaScriptCore.pro
parentb9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff)
downloadqtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.pro')
-rw-r--r--Source/JavaScriptCore/JavaScriptCore.pro7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro
index 393728f99..082244f8d 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pro
+++ b/Source/JavaScriptCore/JavaScriptCore.pro
@@ -7,11 +7,18 @@
TEMPLATE = subdirs
CONFIG += ordered
+linux-*:!equals(QT_ARCH, "arm") {
+ LLIntOffsetsExtractor.file = LLIntOffsetsExtractor.pro
+ LLIntOffsetsExtractor.makefile = Makefile.LLIntOffsetsExtractor
+ SUBDIRS += LLIntOffsetsExtractor
+}
+
derived_sources.file = DerivedSources.pri
target.file = Target.pri
SUBDIRS += derived_sources target
+linux-*:!equals(QT_ARCH, "arm"):addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources)
addStrictSubdirOrderBetween(derived_sources, target)
jsc.file = jsc.pro