Skip to content

[servo] build with clang instead of gcc #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[servo] build with clang instead of gcc #218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2633370
[servo] build with clang instead of gcc
jankeromnes Dec 8, 2018
2aaa03e
[servo] build with only one process to stay within circleci's ram limit
jankeromnes Jan 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions servo/servo.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ RUN sudo apt-get update \
libdbus-1-dev \
libharfbuzz-dev \
ccache \
clang \
libgstreamer1.0-dev \
libgstreamer-plugins-base1.0-dev \
libgstreamer-plugins-bad1.0-dev \
Expand All @@ -40,13 +39,9 @@ RUN sudo apt-get update \
xpra \
&& sudo rm -rf /var/lib/apt/lists/*

# Sadly, Servo can't be built with Clang yet.
ENV CC gcc
ENV CXX g++
ENV HOST_CC gcc
ENV HOST_CXX g++
RUN sudo sed -i "s/CC=clang-[0-9.]\+/CC=gcc/" /etc/environment \
&& sudo sed -i "s/CXX=clang++-[0-9.]\+/CXX=g++/" /etc/environment
# Help clang-sys find LLVM.
# See https://github.com/servo/servo/issues/22384#issuecomment-453240318
ENV CLANG_BASE /usr/lib/llvm-6.0/lib/

# Enable required Xvfb extensions for Servo.
# Source: https://github.com/servo/servo/issues/7512#issuecomment-216665988
Expand All @@ -68,7 +63,7 @@ ENV HARFBUZZ_SYS_NO_PKG_CONFIG 1
RUN ./mach bootstrap-gstreamer

# Build Servo.
RUN ./mach build -d
RUN ./mach build -d -j1

# Configure Janitor for Servo
ADD janitor.json /home/user/
Expand Down