main: allow changing the clang command name
Этот коммит содержится в:
родитель
5ca2e1322c
коммит
1d59a960bc
3 изменённых файлов: 12 добавлений и 4 удалений
12
main.go
12
main.go
|
@ -211,7 +211,11 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
|
||||||
// Compile extra files.
|
// Compile extra files.
|
||||||
for i, path := range spec.ExtraFiles {
|
for i, path := range spec.ExtraFiles {
|
||||||
outpath := filepath.Join(dir, "extra-"+strconv.Itoa(i)+"-"+filepath.Base(path)+".o")
|
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.Stdout = os.Stdout
|
||||||
cmd.Stderr = os.Stderr
|
cmd.Stderr = os.Stderr
|
||||||
cmd.Dir = sourceDir()
|
cmd.Dir = sourceDir()
|
||||||
|
@ -227,7 +231,11 @@ func Compile(pkgName, outpath string, spec *TargetSpec, config *BuildConfig, act
|
||||||
for _, file := range pkg.CFiles {
|
for _, file := range pkg.CFiles {
|
||||||
path := filepath.Join(pkg.Package.Dir, file)
|
path := filepath.Join(pkg.Package.Dir, file)
|
||||||
outpath := filepath.Join(dir, "pkg"+strconv.Itoa(i)+"-"+file+".o")
|
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.Stdout = os.Stdout
|
||||||
cmd.Stderr = os.Stderr
|
cmd.Stderr = os.Stderr
|
||||||
cmd.Dir = sourceDir()
|
cmd.Dir = sourceDir()
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"build-tags": ["cortexm", "linux", "arm"],
|
"build-tags": ["cortexm", "linux", "arm"],
|
||||||
"goos": "linux",
|
"goos": "linux",
|
||||||
"goarch": "arm",
|
"goarch": "arm",
|
||||||
"compiler": "clang-8",
|
"compiler": "clang",
|
||||||
"gc": "marksweep",
|
"gc": "marksweep",
|
||||||
"linker": "ld.lld",
|
"linker": "ld.lld",
|
||||||
"rtlib": "compiler-rt",
|
"rtlib": "compiler-rt",
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
"build-tags": ["js", "wasm"],
|
"build-tags": ["js", "wasm"],
|
||||||
"goos": "js",
|
"goos": "js",
|
||||||
"goarch": "wasm",
|
"goarch": "wasm",
|
||||||
"compiler": "clang-8",
|
"compiler": "clang",
|
||||||
"linker": "wasm-ld",
|
"linker": "wasm-ld",
|
||||||
"cflags": [
|
"cflags": [
|
||||||
"--target=wasm32",
|
"--target=wasm32",
|
||||||
|
|
Загрузка…
Создание таблицы
Сослаться в новой задаче