diff options
Diffstat (limited to 'Source/JavaScriptCore')
-rw-r--r-- | Source/JavaScriptCore/DerivedSources.pri | 28 | ||||
-rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.pro | 10 | ||||
-rw-r--r-- | Source/JavaScriptCore/Target.pri | 18 |
3 files changed, 32 insertions, 24 deletions
diff --git a/Source/JavaScriptCore/DerivedSources.pri b/Source/JavaScriptCore/DerivedSources.pri index 8bbc29d2a..a1a04c873 100644 --- a/Source/JavaScriptCore/DerivedSources.pri +++ b/Source/JavaScriptCore/DerivedSources.pri @@ -95,21 +95,23 @@ klgen.input = KEYWORDLUT_FILES klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} GENERATORS += klgen -EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION -DIRS = $$OUT_PWD $$OUT_PWD/debug $$OUT_PWD/release -for(dir, DIRS) { - file = $$dir/$$EXTRACTOR_BINARY - exists($$file): LLINT_FILES += $$file +!macx{ + EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION + DIRS = $$OUT_PWD $$OUT_PWD/debug $$OUT_PWD/release + for(dir, DIRS) { + file = $$dir/$$EXTRACTOR_BINARY + exists($$file): LLINT_FILES += $$file + } + + #GENERATOR: LLInt + llint.output = ${QMAKE_FILE_IN_PATH}$${QMAKE_DIR_SEP}LLIntAssembly.h + llint.script = $$PWD/offlineasm/asm.rb + llint.input = LLINT_FILES + llint.depends = $$LLINT_DEPENDENCY + llint.commands = ruby $$llint.script $$LLINT_ASSEMBLER ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + GENERATORS += llint } -#GENERATOR: LLInt -llint.output = ${QMAKE_FILE_IN_PATH}$${QMAKE_DIR_SEP}LLIntAssembly.h -llint.script = $$PWD/offlineasm/asm.rb -llint.input = LLINT_FILES -llint.depends = $$LLINT_DEPENDENCY -llint.commands = ruby $$llint.script $$LLINT_ASSEMBLER ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -GENERATORS += llint - linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { # GENERATOR: disassembler disassembler.output = udis86_itab.c diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro index 13130b87f..006d6155a 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pro +++ b/Source/JavaScriptCore/JavaScriptCore.pro @@ -7,16 +7,18 @@ TEMPLATE = subdirs CONFIG += ordered -LLIntOffsetsExtractor.file = LLIntOffsetsExtractor.pro -LLIntOffsetsExtractor.makefile = Makefile.LLIntOffsetsExtractor -SUBDIRS += LLIntOffsetsExtractor +!macx { + LLIntOffsetsExtractor.file = LLIntOffsetsExtractor.pro + LLIntOffsetsExtractor.makefile = Makefile.LLIntOffsetsExtractor + SUBDIRS += LLIntOffsetsExtractor +} derived_sources.file = DerivedSources.pri target.file = Target.pri SUBDIRS += derived_sources target -addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources) +!macx:addStrictSubdirOrderBetween(LLIntOffsetsExtractor, derived_sources) addStrictSubdirOrderBetween(derived_sources, target) jsc.file = jsc.pro diff --git a/Source/JavaScriptCore/Target.pri b/Source/JavaScriptCore/Target.pri index f609de10b..cf8836ece 100644 --- a/Source/JavaScriptCore/Target.pri +++ b/Source/JavaScriptCore/Target.pri @@ -170,13 +170,6 @@ SOURCES += \ jit/JITStubs.cpp \ jit/JumpReplacementWatchpoint.cpp \ jit/ThunkGenerators.cpp \ - llint/LLIntCLoop.cpp \ - llint/LLIntData.cpp \ - llint/LLIntEntrypoints.cpp \ - llint/LLIntExceptions.cpp \ - llint/LLIntSlowPaths.cpp \ - llint/LLIntThunks.cpp \ - llint/LowLevelInterpreter.cpp \ parser/Lexer.cpp \ parser/Nodes.cpp \ parser/ParserArena.cpp \ @@ -285,6 +278,17 @@ SOURCES += \ tools/CodeProfiling.cpp \ yarr/YarrJIT.cpp \ +!macx { + SOURCES += \ + llint/LLIntCLoop.cpp \ + llint/LLIntData.cpp \ + llint/LLIntEntrypoints.cpp \ + llint/LLIntExceptions.cpp \ + llint/LLIntSlowPaths.cpp \ + llint/LLIntThunks.cpp \ + llint/LowLevelInterpreter.cpp +} + linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) { SOURCES += \ disassembler/UDis86Disassembler.cpp \ |