Skip to content

Commit 5d27143

Browse files
dmitshurdmitshur
authored
build, compiler/natives/src/reflect: remove Go 1.11-specific code (#933)
GopherJS 1.12 is out by now, so it's safe to remove this code that was added to deal with differences between Go 1.11.0 and Go 1.11.1. Do so by moving the actively used code from reflect_go1111.go back into reflect.go as it was before PR #865, and delete reflect_go111.go. There should not be any change in behavior. Regenerate ./compiler/natives. Updates #862.
1 parent 3e4dfb7 commit 5d27143

File tree

5 files changed

+251
-426
lines changed

5 files changed

+251
-426
lines changed

‎build/build.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,6 @@ func parseAndAugment(bctx *build.Context, pkg *build.Package, isTest bool, fileS
316316
},
317317
}
318318

319-
// reflect needs to tell Go 1.11 apart from Go 1.11.1 for https://github.com/gopherjs/gopherjs/issues/862,
320-
// so provide it with the custom go1.11.1 build tag whenever we're on Go 1.11.1 or later.
321-
// TODO: Remove this ad hoc special behavior in GopherJS 1.12.
322-
if runtime.Version() != "go1.11" {
323-
nativesContext.ReleaseTags = append(nativesContext.ReleaseTags, "go1.11.1")
324-
}
325-
326319
if nativesPkg, err := nativesContext.Import(importPath, "", 0); err == nil {
327320
names := nativesPkg.GoFiles
328321
if isTest {

0 commit comments

Comments
 (0)