mirror of
https://github.com/tinygo-org/tinygo.git
synced 2026-08-13 07:23:39 +00:00
darwin: fix error with tinygo lldb
Before this patch, `tinygo lldb path/to/package` would result in an
error:
(lldb) target create --arch=arm64-unknown-macosx10.12.0 "/var/folders/17/btmpymwj0wv6n50cmslwyr900000gn/T/tinygo2731663853/main"
error: the specified architecture 'arm64-unknown-macosx10.12.0' is not compatible with 'arm64-apple-macosx10.12.0' in '/var/folders/17/btmpymwj0wv6n50cmslwyr900000gn/T/tinygo2731663853/main'
This patch fixes this error.
Unfortunately, it doesn't get debug information to work yet. I still
haven't figured out what's going wrong here. But it's progress, I guess.
This commit is contained in:
committed by
Ron Evans
parent
81dbbea1c8
commit
e1281b0128
@@ -195,6 +195,7 @@ func LoadTarget(options *Options) (*TargetSpec, error) {
|
|||||||
default:
|
default:
|
||||||
llvmarch = options.GOARCH
|
llvmarch = options.GOARCH
|
||||||
}
|
}
|
||||||
|
llvmvendor := "unknown"
|
||||||
llvmos := options.GOOS
|
llvmos := options.GOOS
|
||||||
if llvmos == "darwin" {
|
if llvmos == "darwin" {
|
||||||
// Use macosx* instead of darwin, otherwise darwin/arm64 will refer
|
// Use macosx* instead of darwin, otherwise darwin/arm64 will refer
|
||||||
@@ -204,12 +205,14 @@ func LoadTarget(options *Options) (*TargetSpec, error) {
|
|||||||
// Looks like Apple prefers to call this architecture ARM64
|
// Looks like Apple prefers to call this architecture ARM64
|
||||||
// instead of AArch64.
|
// instead of AArch64.
|
||||||
llvmarch = "arm64"
|
llvmarch = "arm64"
|
||||||
|
llvmos = "macosx11.0.0"
|
||||||
}
|
}
|
||||||
|
llvmvendor = "apple"
|
||||||
}
|
}
|
||||||
// Target triples (which actually have four components, but are called
|
// Target triples (which actually have four components, but are called
|
||||||
// triples for historical reasons) have the form:
|
// triples for historical reasons) have the form:
|
||||||
// arch-vendor-os-environment
|
// arch-vendor-os-environment
|
||||||
target := llvmarch + "-unknown-" + llvmos
|
target := llvmarch + "-" + llvmvendor + "-" + llvmos
|
||||||
if options.GOOS == "windows" {
|
if options.GOOS == "windows" {
|
||||||
target += "-gnu"
|
target += "-gnu"
|
||||||
} else if options.GOARCH == "arm" {
|
} else if options.GOARCH == "arm" {
|
||||||
|
|||||||
Reference in New Issue
Block a user