Mir

Merge lp:~vanvugt/mir/fix-1194385 into lp:~mir-team/mir/trunk

  1. fix-1194385
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: no longer in the source branch.
Merged at revision: 773
Proposed branch: lp:~vanvugt/mir/fix-1194385
Merge into: lp:~mir-team/mir/trunk
Diff against target: 18 lines (+5/-1)
1 file modified
CMakeLists.txt (+5/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1194385
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+171233@code.launchpad.net

Commit message

Don't pass a clang-only option to gcc. It will not understand and cause
build failure (LP: #1194385)

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Google suggests it's a clang-only option...

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:772
http://jenkins.qa.ubuntu.com/job/mir-ci/820/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1033
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/918/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/490

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/820/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:773
http://jenkins.qa.ubuntu.com/job/mir-ci/821/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/491

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/821/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-06-25 08:11:24 +0000
3+++ CMakeLists.txt 2013-06-25 08:59:42 +0000
4@@ -43,9 +43,13 @@
5 include (GNUInstallDirs)
6
7 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Werror -Wall -pedantic -Wextra -fPIC")
8-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC -Wno-return-type-c-linkage")
9+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
10 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
11
12+if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
13+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage")
14+endif()
15+
16 #####################################################################
17 # Enable code coverage calculation with gcov/gcovr/lcov
18 # Usage:

Subscribers

People subscribed via source and target branches