From 4b7d5deb843a46aa34f337af852da940556cbd32 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 12 Jan 2016 23:20:28 -0800
Subject: Publish Soong configuration to Make variables

For configuration like TARGET_GLOBAL_CFLAGS, it would be good to have
Make and Soong use the same values. This change adds an interface for
packages like cc to verify the current value of make variables match the
Soong equivalents, and once they're satisfied with the results, remove
the make definition and use the value from Soong.

The cc implementation exports a few variables currently that I expect to
match between both implementations in all cases. It also checks
{CLANG,}{HOST,TARGET}_GLOBAL_{C,LD}FLAGS, which should be mostly similar
between make and soong now.

Bug: 23566674
Change-Id: Idc8582ef31ace11a8baefcf525c3683f08a573aa
---
 cc/makevars.go | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 cc/makevars.go

(limited to 'cc')

diff --git a/cc/makevars.go b/cc/makevars.go
new file mode 100644
index 00000000..00a4f712
--- /dev/null
+++ b/cc/makevars.go
@@ -0,0 +1,111 @@
+// Copyright 2016 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cc
+
+import (
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"android/soong/common"
+)
+
+func init() {
+	common.RegisterMakeVarsProvider(pctx, makeVarsProvider)
+}
+
+func makeVarsProvider(ctx common.MakeVarsContext) {
+	ctx.Strict("LLVM_PREBUILTS_VERSION", "${clangVersion}")
+	ctx.Strict("LLVM_PREBUILTS_BASE", "${clangBase}")
+
+	hostType := common.CurrentHostType()
+	arches := ctx.Config().HostArches[hostType]
+	makeVarsToolchain(ctx, "", common.Host, hostType, arches[0])
+	if len(arches) > 1 {
+		makeVarsToolchain(ctx, "2ND_", common.Host, hostType, arches[1])
+	}
+
+	if winArches, ok := ctx.Config().HostArches[common.Windows]; ok {
+		makeVarsToolchain(ctx, "", common.Host, common.Windows, winArches[0])
+		if len(winArches) > 1 {
+			makeVarsToolchain(ctx, "2ND_", common.Host, common.Windows, winArches[1])
+		}
+	}
+
+	arches = ctx.Config().DeviceArches
+	makeVarsToolchain(ctx, "", common.Device, common.NoHostType, arches[0])
+	if len(arches) > 1 {
+		makeVarsToolchain(ctx, "2ND_", common.Device, common.NoHostType, arches[1])
+	}
+}
+
+func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
+	hod common.HostOrDevice, ht common.HostType, arch common.Arch) {
+	var typePrefix string
+	if hod.Host() {
+		if ht == common.Windows {
+			typePrefix = "HOST_CROSS_"
+		} else {
+			typePrefix = "HOST_"
+		}
+	} else {
+		typePrefix = "TARGET_"
+	}
+	makePrefix := secondPrefix + typePrefix
+
+	toolchain := toolchainFactories[hod][ht][arch.ArchType](arch)
+
+	globalCflags := fmt.Sprintf("${commonGlobalCflags} ${%sGlobalCflags}", hod)
+
+	ctx.CheckSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
+		toolchain.ToolchainCflags(),
+		globalCflags,
+		toolchain.Cflags(),
+	}, " "))
+	ctx.CheckSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
+		toolchain.ToolchainLdflags(),
+		toolchain.Ldflags(),
+	}, " "))
+
+	if toolchain.ClangSupported() {
+		clangPrefix := secondPrefix + "CLANG_" + typePrefix
+		clangExtras := "-target " + toolchain.ClangTriple() + " -B" + filepath.Join(toolchain.GccRoot(), toolchain.GccTriple(), "bin")
+
+		globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod)
+
+		ctx.CheckSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
+			toolchain.ToolchainClangCflags(),
+			globalClangCflags,
+			toolchain.ClangCflags(),
+			clangExtras,
+		}, " "))
+		ctx.CheckSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
+			toolchain.ToolchainClangLdflags(),
+			toolchain.ClangLdflags(),
+			clangExtras,
+		}, " "))
+	}
+
+	ctx.Strict(makePrefix+"CC", gccCmd(toolchain, "gcc"))
+	ctx.Strict(makePrefix+"CXX", gccCmd(toolchain, "g++"))
+
+	if ht == common.Darwin {
+		ctx.Strict(makePrefix+"AR", "${macArPath}")
+	} else {
+		ctx.Strict(makePrefix+"AR", gccCmd(toolchain, "ar"))
+		ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf"))
+		ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm"))
+	}
+}
-- 
cgit v1.2.3