cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [12/15] git commit: remove -flto from compiler flags
Date Tue, 26 Aug 2014 20:46:45 GMT
remove -flto from compiler flags

gcc -flto produce broken binary on armhf


Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/1f76dfef
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/1f76dfef
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/1f76dfef

Branch: refs/heads/master
Commit: 1f76dfef6092db9abd89b9400e530c5301c104e2
Parents: 040c898
Author: Maxim Ermilov <maxim.ermilov@canonical.com>
Authored: Sat Jun 28 08:34:12 2014 +0400
Committer: Maxim Ermilov <maxim.ermilov@canonical.com>
Committed: Tue Aug 19 14:20:31 2014 +0400

----------------------------------------------------------------------
 CMakeLists.txt          | 2 +-
 bin/build/lib/ubuntu.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/1f76dfef/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 274e135..b41e5e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ configure_file (
 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")

http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/1f76dfef/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 @@ function buildClickPackage(campoDir, ubuntuDir, nobuild, architecture,
framework
     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 @@ module.exports.build = function(rootDir, target, nobuild, architecture,
framewor
     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);
         });
     }


Mime
View raw message