From 26333708fb216feb6d40c981cfc8620a22d6ff6e Mon Sep 17 00:00:00 2001 From: Jan Keromnes Date: Sat, 8 Dec 2018 11:27:08 +0100 Subject: [PATCH 1/2] [servo] build with clang instead of gcc --- servo/servo.dockerfile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/servo/servo.dockerfile b/servo/servo.dockerfile index 28fcd38..c70aa3d 100644 --- a/servo/servo.dockerfile +++ b/servo/servo.dockerfile @@ -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 \ @@ -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 From 2aaa03e6ab72ef478ba77afc863ab0490b60b79c Mon Sep 17 00:00:00 2001 From: Jan Keromnes Date: Sat, 12 Jan 2019 23:01:54 +0100 Subject: [PATCH 2/2] [servo] build with only one process to stay within circleci's ram limit --- servo/servo.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servo/servo.dockerfile b/servo/servo.dockerfile index c70aa3d..e3f6948 100644 --- a/servo/servo.dockerfile +++ b/servo/servo.dockerfile @@ -63,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/