diff options
-rw-r--r-- | meta/classes/go.bbclass | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go_1.14.bb | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index e6c3591479..16e46398b1 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass | |||
@@ -145,11 +145,11 @@ FILES_${PN}-staticdev = "${libdir}/go/pkg" | |||
145 | 145 | ||
146 | INSANE_SKIP_${PN} += "ldflags" | 146 | INSANE_SKIP_${PN} += "ldflags" |
147 | 147 | ||
148 | # Add -buildmode=pie to GOBUILDFLAGS to satisfy "textrel" QA checking, but mips | 148 | # Add -buildmode=pie to GOBUILDFLAGS to satisfy "textrel" QA checking, but |
149 | # doesn't support -buildmode=pie, so skip the QA checking for mips and its | 149 | # windows/mips/riscv doesn't support -buildmode=pie, so skip the QA checking |
150 | # variants. | 150 | # for windows/mips/riscv and their variants. |
151 | python() { | 151 | python() { |
152 | if 'mips' in d.getVar('TARGET_ARCH') or 'riscv' in d.getVar('TARGET_ARCH'): | 152 | if 'mips' in d.getVar('TARGET_ARCH') or 'riscv' in d.getVar('TARGET_ARCH') or 'windows' in d.getVar('TARGET_GOOS'): |
153 | d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel") | 153 | d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel") |
154 | else: | 154 | else: |
155 | d.appendVar('GOBUILDFLAGS', ' -buildmode=pie') | 155 | d.appendVar('GOBUILDFLAGS', ' -buildmode=pie') |
diff --git a/meta/recipes-devtools/go/go_1.14.bb b/meta/recipes-devtools/go/go_1.14.bb index bc90a1329e..c17527998b 100644 --- a/meta/recipes-devtools/go/go_1.14.bb +++ b/meta/recipes-devtools/go/go_1.14.bb | |||
@@ -3,11 +3,11 @@ require go-target.inc | |||
3 | 3 | ||
4 | export GOBUILDMODE="" | 4 | export GOBUILDMODE="" |
5 | export CGO_ENABLED_riscv64 = "" | 5 | export CGO_ENABLED_riscv64 = "" |
6 | # Add pie to GOBUILDMODE to satisfy "textrel" QA checking, but mips/riscv | 6 | # Add pie to GOBUILDMODE to satisfy "textrel" QA checking, but |
7 | # doesn't support -buildmode=pie, so skip the QA checking for mips/riscv and its | 7 | # windows/mips/riscv doesn't support -buildmode=pie, so skip the QA checking |
8 | # variants. | 8 | # for windows/mips/riscv and their variants. |
9 | python() { | 9 | python() { |
10 | if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv' in d.getVar('TARGET_ARCH',True): | 10 | if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv' in d.getVar('TARGET_ARCH',True) or 'windows' in d.getVar('TARGET_GOOS', True): |
11 | d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") | 11 | d.appendVar('INSANE_SKIP_%s' % d.getVar('PN',True), " textrel") |
12 | else: | 12 | else: |
13 | d.setVar('GOBUILDMODE', 'pie') | 13 | d.setVar('GOBUILDMODE', 'pie') |