Commit 06aaeef1 authored by Daiwei Li's avatar Daiwei Li
Browse files

nacl-configure: Don't skip xmlpatterns


qtxmlpatterns compiles/works on nacl

Change-Id: I4448ab9a03d0a52c591d0491ac8ca0a49e8a068f
Reviewed-by: default avatarMorten Johan Sørvig <morten.sorvig@theqtcompany.com>
No related merge requests found
Showing with 5 additions and 5 deletions
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
if [[ -z "$NACL_SDK_ROOT" ]] if [[ -z "$NACL_SDK_ROOT" ]]
then then
echo "" echo ""
echo Set NACL_SDK_ROOT before running nacl-configure. echo Set NACL_SDK_ROOT before running nacl-configure.
echo Example: export NACL_SDK_ROOT=/Users/USER/code/nacl_sdk/pepper_35 echo Example: export NACL_SDK_ROOT=/Users/USER/code/nacl_sdk/pepper_35
echo "" echo ""
exit exit
...@@ -32,7 +32,7 @@ if [ $# -eq 0 ] ...@@ -32,7 +32,7 @@ if [ $# -eq 0 ]
echo "" echo ""
echo "No arguments supplied. Usage:" echo "No arguments supplied. Usage:"
echo "\"nacl-configure <tooolchain> [release|debug] [32|64]" echo "\"nacl-configure <tooolchain> [release|debug] [32|64]"
echo "Toolchain is one of:" echo "Toolchain is one of:"
echo " ${platform}_arm_newlib" echo " ${platform}_arm_newlib"
echo " ${platform}_pnacl" echo " ${platform}_pnacl"
echo " ${platform}_x86_glibc" echo " ${platform}_x86_glibc"
...@@ -40,7 +40,7 @@ if [ $# -eq 0 ] ...@@ -40,7 +40,7 @@ if [ $# -eq 0 ]
echo " emscripten" echo " emscripten"
echo " host" echo " host"
echo "" echo ""
exit exit
fi fi
# QtBase and configure script location. Look for ../configure first, # QtBase and configure script location. Look for ../configure first,
...@@ -209,7 +209,7 @@ if [[ $TOOLCHAIN != "host" ]]; then ...@@ -209,7 +209,7 @@ if [[ $TOOLCHAIN != "host" ]]; then
NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-sse2" NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-sse2"
fi fi
# misc # misc
NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-qpa-platform-guard -skip xmlpatterns -no-warnings-are-errors -no-qml-debug -no-dbus" NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-qpa-platform-guard -no-warnings-are-errors -no-qml-debug -no-dbus"
# Newlib is static builds only. # Newlib is static builds only.
if [[ $QT_MKSPEC == *newlib* ]] if [[ $QT_MKSPEC == *newlib* ]]
...@@ -217,7 +217,7 @@ if [[ $QT_MKSPEC == *newlib* ]] ...@@ -217,7 +217,7 @@ if [[ $QT_MKSPEC == *newlib* ]]
NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -static" NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -static"
fi fi
# C++11 is broken on pnacl, see Chromium bug 314944 # C++11 is broken on pnacl, see Chromium bug 314944
if [[ $QT_MKSPEC == *pnacl* ]] if [[ $QT_MKSPEC == *pnacl* ]]
then then
NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-c++11" NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-c++11"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment