Commit c70ff02e authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

mac: Don't set DEVELOPER_DIR env var for compiles.

Compiles shouldn't shell out to non-clang processes, and we know that
clang doesn't read DEVELOPER_DIR, so this shouldn't be needed.

Bug: 780980
Change-Id: I811786f567c517aee9a82867336da7b2adb3bf44
Reviewed-on: https://chromium-review.googlesource.com/c/1358698Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613129}
parent 02ec4e9c
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
# some enhancements since the commands on Mac are slightly different than on # some enhancements since the commands on Mac are slightly different than on
# Linux. # Linux.
import("../goma.gni")
import("//build/config/clang/clang.gni") import("//build/config/clang/clang.gni")
import("//build/config/coverage/coverage.gni") import("//build/config/coverage/coverage.gni")
import("../goma.gni")
if (is_ios) { if (is_ios) {
import("//build/config/ios/ios_sdk.gni") import("//build/config/ios/ios_sdk.gni")
} }
...@@ -19,9 +19,9 @@ assert(host_os == "mac") ...@@ -19,9 +19,9 @@ assert(host_os == "mac")
import("//build/toolchain/cc_wrapper.gni") import("//build/toolchain/cc_wrapper.gni")
import("//build/toolchain/clang_static_analyzer.gni") import("//build/toolchain/clang_static_analyzer.gni")
import("//build/toolchain/concurrent_links.gni")
import("//build/toolchain/goma.gni") import("//build/toolchain/goma.gni")
import("//build/toolchain/toolchain.gni") import("//build/toolchain/toolchain.gni")
import("//build/toolchain/concurrent_links.gni")
declare_args() { declare_args() {
# Reduce the number of tasks using the copy_bundle_data and compile_xcassets # Reduce the number of tasks using the copy_bundle_data and compile_xcassets
...@@ -205,7 +205,7 @@ template("mac_toolchain") { ...@@ -205,7 +205,7 @@ template("mac_toolchain") {
tool("cc") { tool("cc") {
depfile = "{{output}}.d" depfile = "{{output}}.d"
precompiled_header_type = "gcc" precompiled_header_type = "gcc"
command = "$env_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}" command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
depsformat = "gcc" depsformat = "gcc"
description = "CC {{output}}" description = "CC {{output}}"
outputs = [ outputs = [
...@@ -216,7 +216,7 @@ template("mac_toolchain") { ...@@ -216,7 +216,7 @@ template("mac_toolchain") {
tool("cxx") { tool("cxx") {
depfile = "{{output}}.d" depfile = "{{output}}.d"
precompiled_header_type = "gcc" precompiled_header_type = "gcc"
command = "$env_wrapper $cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}" command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}"
depsformat = "gcc" depsformat = "gcc"
description = "CXX {{output}}" description = "CXX {{output}}"
outputs = [ outputs = [
...@@ -227,7 +227,7 @@ template("mac_toolchain") { ...@@ -227,7 +227,7 @@ template("mac_toolchain") {
tool("asm") { tool("asm") {
# For GCC we can just use the C compiler to compile assembly. # For GCC we can just use the C compiler to compile assembly.
depfile = "{{output}}.d" depfile = "{{output}}.d"
command = "$env_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} -c {{source}} -o {{output}}" command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} -c {{source}} -o {{output}}"
depsformat = "gcc" depsformat = "gcc"
description = "ASM {{output}}" description = "ASM {{output}}"
outputs = [ outputs = [
...@@ -238,7 +238,7 @@ template("mac_toolchain") { ...@@ -238,7 +238,7 @@ template("mac_toolchain") {
tool("objc") { tool("objc") {
depfile = "{{output}}.d" depfile = "{{output}}.d"
precompiled_header_type = "gcc" precompiled_header_type = "gcc"
command = "$env_wrapper $cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objc}} -c {{source}} -o {{output}}" command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objc}} -c {{source}} -o {{output}}"
depsformat = "gcc" depsformat = "gcc"
description = "OBJC {{output}}" description = "OBJC {{output}}"
outputs = [ outputs = [
...@@ -249,7 +249,7 @@ template("mac_toolchain") { ...@@ -249,7 +249,7 @@ template("mac_toolchain") {
tool("objcxx") { tool("objcxx") {
depfile = "{{output}}.d" depfile = "{{output}}.d"
precompiled_header_type = "gcc" precompiled_header_type = "gcc"
command = "$env_wrapper $cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objcc}} -c {{source}} -o {{output}}" command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objcc}} -c {{source}} -o {{output}}"
depsformat = "gcc" depsformat = "gcc"
description = "OBJCXX {{output}}" description = "OBJCXX {{output}}"
outputs = [ outputs = [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment