main: allow changing the clang command name

Этот коммит содержится в:
Ayke van Laethem 2019-04-27 17:31:50 +02:00 коммит произвёл Ron Evans
родитель 5ca2e1322c
коммит 1d59a960bc
3 изменённых файлов: 12 добавлений и 4 удалений

12
main.go
Просмотреть файл

@ -211,7 +211,11 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
// Compile extra files.
for i, path := range spec.ExtraFiles {
outpath := filepath.Join(dir, "extra-"+strconv.Itoa(i)+"-"+filepath.Base(path)+".o")
cmd := exec.Command(spec.Compiler, append(spec.CFlags, "-c", "-o", outpath, path)...)
cmdName := spec.Compiler
if name, ok := commands[cmdName]; ok {
cmdName = name
}
cmd := exec.Command(cmdName, append(spec.CFlags, "-c", "-o", outpath, path)...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Dir = sourceDir()
@ -227,7 +231,11 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
for _, file := range pkg.CFiles {
path := filepath.Join(pkg.Package.Dir, file)
outpath := filepath.Join(dir, "pkg"+strconv.Itoa(i)+"-"+file+".o")
cmd := exec.Command(spec.Compiler, append(spec.CFlags, "-c", "-o", outpath, path)...)
cmdName := spec.Compiler
if name, ok := commands[cmdName]; ok {
cmdName = name
}
cmd := exec.Command(cmdName, append(spec.CFlags, "-c", "-o", outpath, path)...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Dir = sourceDir()

Просмотреть файл

@ -2,7 +2,7 @@
"build-tags": ["cortexm", "linux", "arm"],
"goos": "linux",
"goarch": "arm",
"compiler": "clang-8",
"compiler": "clang",
"gc": "marksweep",
"linker": "ld.lld",
"rtlib": "compiler-rt",

Просмотреть файл

@ -3,7 +3,7 @@
"build-tags": ["js", "wasm"],
"goos": "js",
"goarch": "wasm",
"compiler": "clang-8",
"compiler": "clang",
"linker": "wasm-ld",
"cflags": [
"--target=wasm32",