From 8c636ac37b7cd0bb8405862fe9e003b7e67287b4 Mon Sep 17 00:00:00 2001 From: Karl Zylinski Date: Sat, 7 Sep 2024 22:02:17 +0200 Subject: Fix build tags that use ! multiple times on one line. Those don't actually do anything since build tags use OR within the line. So something like //+build !windows, !linux would actually build on both linux and windows. What was intended in all these cases was probably AND, which you get by splitting them into separate lines. --- core/debug/trace/trace_nil.odin | 4 +++- core/flags/errors_nonbsd.odin | 3 ++- core/flags/internal_rtti_nonbsd.odin | 3 ++- core/testing/signal_handler_other.odin | 8 +++++++- tests/core/net/test_core_net.odin | 3 ++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/core/debug/trace/trace_nil.odin b/core/debug/trace/trace_nil.odin index 8611d7726..ca8bd7817 100644 --- a/core/debug/trace/trace_nil.odin +++ b/core/debug/trace/trace_nil.odin @@ -1,4 +1,6 @@ -//+build !windows !linux !darwin +//+build !windows +//+build !linux +//+build !darwin package debug_trace import "base:runtime" diff --git a/core/flags/errors_nonbsd.odin b/core/flags/errors_nonbsd.odin index a77f12abf..e129aff74 100644 --- a/core/flags/errors_nonbsd.odin +++ b/core/flags/errors_nonbsd.odin @@ -1,4 +1,5 @@ -//+build !netbsd !openbsd +//+build !netbsd +//+build !openbsd package flags import "base:runtime" diff --git a/core/flags/internal_rtti_nonbsd.odin b/core/flags/internal_rtti_nonbsd.odin index 27fdb3b75..0044898d5 100644 --- a/core/flags/internal_rtti_nonbsd.odin +++ b/core/flags/internal_rtti_nonbsd.odin @@ -1,5 +1,6 @@ //+private -//+build !netbsd !openbsd +//+build !netbsd +//+build !openbsd package flags import "core:net" diff --git a/core/testing/signal_handler_other.odin b/core/testing/signal_handler_other.odin index 6f39205c7..d6d494fa4 100644 --- a/core/testing/signal_handler_other.odin +++ b/core/testing/signal_handler_other.odin @@ -1,5 +1,11 @@ //+private -//+build !windows !linux !darwin !freebsd !openbsd !netbsd !haiku +//+build !windows +//+build !linux +//+build !darwin +//+build !freebsd +//+build !openbsd +//+build !netbsd +//+build !haiku package testing /* diff --git a/tests/core/net/test_core_net.odin b/tests/core/net/test_core_net.odin index f38fa11e6..8a9272882 100644 --- a/tests/core/net/test_core_net.odin +++ b/tests/core/net/test_core_net.odin @@ -10,7 +10,8 @@ A test suite for `core:net` */ -//+build !netbsd !openbsd +//+build !netbsd +//+build !openbsd package test_core_net import "core:testing" -- cgit v1.2.3