commit 1f76dfef6092db9abd89b9400e530c5301c104e2
author Maxim Ermilov <maxim.ermilov@canonical.com> Sat Jun 28 08:34:12 2014 +0400
committer Maxim Ermilov <maxim.ermilov@canonical.com> Tue Aug 19 14:20:31 2014 +0400
tree ae7f2aee78c2ec43f5af9c7b66fd0e83b93e0a42
parent 040c8981e11bbe6ca4f9b2648b194368a5bc744d

remove -flto from compiler flags

gcc -flto produce broken binary on armhf

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 274e135..b41e5e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@
 SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-omit-frame-pointer -Wall -Wextra -DCORDOVA_UBUNTU_VERSION=\\\"${VERSION}\\\" -DCORDOVA_UBUNTU_MAJOR_VERSION=${MAJOR_VERSION} -DCORDOVA_UBUNTU_MINOR_VERSION=${MINOR_VERSION} -I ${PROJECT_SOURCE_DIR}/src")
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -Os")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os")
 endif()
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -g")

bin/build/lib/ubuntu.js

diff --git a/bin/build/lib/ubuntu.js b/bin/build/lib/ubuntu.js
index 3fcd02e..f17fae1 100644
--- a/bin/build/lib/ubuntu.js
+++ b/bin/build/lib/ubuntu.js
@@ -234,7 +234,6 @@
     var cmakeCmd = 'click chroot -a' + architecture + ' -f ' + framework + ' run cmake ' + campoDir
               + ' -DCMAKE_INSTALL_PREFIX="' + prefixDir + '"' + ' -DCMAKE_BUILD_TYPE=' + buildType;
 
-
     if (framework == 'ubuntu-sdk-13.10')
         cmakeCmd += ' -DCMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt';
 
@@ -354,11 +353,11 @@
     assert.ok(fs.existsSync(campoDir));
 
     if (target === module.exports.PHONE)
-        return buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework);
+        return buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework, debug);
     if (target === module.exports.DESKTOP)
         return buildNative(campoDir, ubuntuDir, nobuild, debug);
     if (target === module.exports.ALL) {
-        return buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework).then(function () {
+        return buildClickPackage(campoDir, ubuntuDir, nobuild, architecture, framework, debug).then(function () {
             return buildNative(campoDir, ubuntuDir, nobuild);
         });
     }