Merge lp:~saviq/libhybris/ubuntu-cross into lp:libhybris/ubuntu

Proposed by Michał Sawicz on 2013-10-12
Status: Needs review
Proposed branch: lp:~saviq/libhybris/ubuntu-cross
Merge into: lp:libhybris/ubuntu
Diff against target: 20 lines (+8/-2)
1 file modified
debian/rules (+8/-2)
To merge this branch: bzr merge lp:~saviq/libhybris/ubuntu-cross
Reviewer Review Type Date Requested Status
Steve Langasek 2013-10-12 Approve on 2013-10-12
Review via email: mp+190778@code.launchpad.net

Commit message

Enable cross-builds in debian/rules.

To post a comment you must log in.
Steve Langasek (vorlon) wrote :

Looks right.

review: Approve

Unmerged revisions

90. By Michał Sawicz on 2013-10-12

Enable cross-building in debian/rules.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2013-06-26 20:30:04 +0000
3+++ debian/rules 2013-10-12 01:05:17 +0000
4@@ -21,8 +21,14 @@
5 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
6
7 # Compiler
8-export CC=gcc-4.7
9-export CXX=g++-4.7
10+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
11+ CC=$(DEB_HOST_GNU_TYPE)-gcc-4.7
12+ CXX=$(DEB_HOST_GNU_TYPE)-g++-4.7
13+endif
14+
15+export CC ?= gcc-4.7
16+export CXX ?= g++-4.7
17+
18
19 # Priority of the alternatives
20 alt_priority := 1000

Subscribers

People subscribed via source and target branches