Skip to content

Commit

Permalink
Auto merge of #6531 - mmatyas:arm_build2, r=metajack
Browse files Browse the repository at this point in the history
Allow to override CXX and AR for cross compilation.

**Update:** Please see issue #6537 

Required by some ARM patches.

Part of #6327

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6531)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Sep 1, 2015
2 parents 4404809 + a4b4d96 commit 67eadaa
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ports/gonk/makefile.cargo
@@ -1,7 +1,7 @@
ifeq (androideabi,$(findstring androideabi,$(TARGET)))
ifeq (eabi,$(findstring eabi,$(TARGET)))

CXX := $(TARGET)-g++
AR := $(TARGET)-ar
CXX ?= $(TARGET)-g++
AR ?= $(TARGET)-ar
CFLAGS := -fPIC -O2

else
Expand Down

0 comments on commit 67eadaa

Please sign in to comment.