nacldeployqt uses mac toolchain on linux

[hekra01]

• build nacl.bc on linux
• try: nacldeployqt nacl.bc
• observe: nacl.pexe not created

Suggest fix:

diff --git a/src/tools/nacldeployqt/main.cpp b/src/tools/nacldeployqt/main.cpp
index 23b088e..3ad4a61 100644
--- a/src/tools/nacldeployqt/main.cpp
+++ b/src/tools/nacldeployqt/main.cpp
@@ -108,9 +108,12 @@ int QtNaclDeployer::deploy()
         qDebug() << "create_html.py not found at" << createHtml;
         return 0;
     }
-    QString pnaclFinalize = naclSdkRoot + "/toolchain/mac_pnacl/bin/pnacl-finalize";
-    if (!QFile(pnaclFinalize).exists())
-        pnaclFinalize = naclSdkRoot + "/toolchain/linux_pnacl/bin/pnacl-finalize";
+    QString pnaclFinalize = "";
+#if defined(Q_OS_LINUX)
+    pnaclFinalize = naclSdkRoot + "/toolchain/linux_pnacl/bin/pnacl-finalize";
+#elif defined(Q_OS_MAC)
+    pnaclFinalize = naclSdkRoot + "/toolchain/mac_pnacl/bin/pnacl-finalize";
+#endif
     if (!QFile(pnaclFinalize).exists()) {
         qDebug() << "pnacl-finalize not found at" << pnaclFinalize;
         return 0;
@@ -128,6 +131,7 @@ int QtNaclDeployer::deploy()
         qDebug() << " ";
         qDebug() << "Deploying" << binary;
         qDebug() << "Using SDK" << naclSdkRoot;
+        qDebug() << "Using finalize " << pnaclFinalize << " isPNaCl " << isPNaCl;
         qDebug() << "Qt libs in" << qtLibDir;
         qDebug() << "Output directory:" << QDir(outDir).canonicalPath();
         qDebug() << " ";
@@ -219,9 +223,16 @@ int QtNaclDeployer::deploy()
     }

     // Find the debugger, print startup instructions
-    QString gdb = naclSdkRoot + "/toolchain/mac_x86_glibc/bin/i686-nacl-gdb";
-    if (!QFile(gdb).exists())
-        gdb = naclSdkRoot + "/toolchain/linux_x86_glibc/bin/i686-nacl-gdb";
+    QString gdb = "";
+#if defined(Q_OS_LINUX)
+    gdb = naclSdkRoot + "/toolchain/linux_x86_glibc/bin/i686-nacl-gdb";
+#elif defined(Q_OS_MAC)
+    gdb = naclSdkRoot + "/toolchain/mac_x86_glibc/bin/i686-nacl-gdb";
+#endif