OpenJDK / openjfx / 9-dev / rt
changeset 9381:0576d7a6f137
8141345: Cannot build WebKit with bison3
Reviewed-by: kcr
| author | ghb |
|---|---|
| date | Fri, 13 Nov 2015 11:48:57 -0800 |
| parents | 84807546f59e |
| children | 570bf70c2b60 |
| files | modules/web/src/main/native/Source/WebCore/DerivedSourcesJava.pri |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/modules/web/src/main/native/Source/WebCore/DerivedSourcesJava.pri Fri Nov 13 11:48:57 2015 -0800 +++ b/modules/web/src/main/native/Source/WebCore/DerivedSourcesJava.pri Fri Nov 13 11:48:57 2015 -0800 @@ -1284,10 +1284,12 @@ pluginsresources.clean = ${QMAKE_FILE_OUT} $${GENERATED_SOURCES_DIR}/PlugInsResources.h GENERATORS += pluginsresources +#don't generate #line directives on windows due to Bison 3.0 generates path with single backslash instead of two backslash +win32-* : XPATHBISON_NO_LINES = -l # GENERATOR 11: XPATH grammar xpathbison.output = ${QMAKE_FILE_BASE}.cpp xpathbison.input = XPATHBISON -xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o $${GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h +xpathbison.commands = bison $${XPATHBISON_NO_LINES} -d -p xpathyy ${QMAKE_FILE_NAME} -o $${GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h xpathbison.depends = ${QMAKE_FILE_NAME} GENERATORS += xpathbison