← Back to branch summary

~chromium-team/chromium-browser/vivid-working

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Chad MILLER
  • Date: 2015-10-22 15:03:01 UTC
  • mfrom: (1157.1.53 wily-working)
  • Revision ID: chad.miller@canonical.com-20151022150301-j8828wrn4jc3asts
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
93
93
 
94
94
# Prefer gcc/g++ over clang until clang is better tested in Ubuntu.
95
95
GYP_DEFINES += clang=0
96
 
#GYP_DEFINED += clang_use_chrome_plugins=
 
96
#GYP_DEFINES += clang_use_chrome_plugins=0
97
97
 
98
98
#GYP_DEFINES += use_ozone=1 ozone_auto_platforms=0 ozone_platform_mir=1 ozone_platform_wayland=0
99
99
#GYP_DEFINES += use_ozone=1
238
238
ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
239
239
CROSS_BUILD = PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:/usr/$(DEB_HOST_MULTIARCH)/lib/pkgconfig CXX=$(DEB_HOST_GNU_TYPE)-g++ CC=$(DEB_HOST_GNU_TYPE)-gcc AR=$(DEB_HOST_GNU_TYPE)-ar AS=$(DEB_HOST_GNU_TYPE)-as CPP=$(DEB_HOST_GNU_TYPE)-cpp LD=$(DEB_HOST_GNU_TYPE)-ld
240
240
else
241
 
CROSS_BUILD = CC=$$(which gcc-4.8 gcc |head -1) CXX=$$(which g++-4.8 g++ |head -1)
 
241
CROSS_BUILD = CC=clang CXX=clang++
242
242
endif
243
243
 
244
244