odin: dev-2025-04 -> dev-2025-06 (#416170)
This commit is contained in:
commit
725f7920ae
@ -1,12 +1,12 @@
|
|||||||
diff --git a/src/linker.cpp b/src/linker.cpp
|
diff --git a/src/linker.cpp b/src/linker.cpp
|
||||||
index ec165ef7d..91a28b8fc 100644
|
index 2210c13..803b654 100644
|
||||||
--- a/src/linker.cpp
|
--- a/src/linker.cpp
|
||||||
+++ b/src/linker.cpp
|
+++ b/src/linker.cpp
|
||||||
@@ -769,18 +769,6 @@ try_cross_linking:;
|
@@ -779,18 +779,6 @@ try_cross_linking:;
|
||||||
gbString platform_lib_str = gb_string_make(heap_allocator(), "");
|
}
|
||||||
defer (gb_string_free(platform_lib_str));
|
platform_lib_str = gb_string_append_fmt(platform_lib_str, "--sysroot %s ", darwin_sdk_path);
|
||||||
if (build_context.metrics.os == TargetOs_darwin) {
|
|
||||||
- platform_lib_str = gb_string_appendc(platform_lib_str, "-Wl,-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib ");
|
- platform_lib_str = gb_string_appendc(platform_lib_str, "-L/usr/local/lib ");
|
||||||
-
|
-
|
||||||
- // Homebrew's default library path, checking if it exists to avoid linking warnings.
|
- // Homebrew's default library path, checking if it exists to avoid linking warnings.
|
||||||
- if (gb_file_exists("/opt/homebrew/lib")) {
|
- if (gb_file_exists("/opt/homebrew/lib")) {
|
||||||
|
@ -12,13 +12,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "odin";
|
pname = "odin";
|
||||||
version = "dev-2025-04";
|
version = "dev-2025-06";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "odin-lang";
|
owner = "odin-lang";
|
||||||
repo = "Odin";
|
repo = "Odin";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-dVC7MgaNdgKy3X9OE5ZcNCPnuDwqXszX9iAoUglfz2k=";
|
hash = "sha256-Dhy62+ccIjXUL/lK8IQ+vvGEsTrd153tPp4WIdl3rh4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user