From 3afdc93a5013479781ebb6d0a1d5cfb80d6d33fc Mon Sep 17 00:00:00 2001 From: Arnaud Date: Wed, 15 Oct 2025 07:26:37 +0200 Subject: [PATCH] Remove LDFLAGS from code in order to pass them in command line --- Makefile | 6 +++--- codex/bridge.go | 3 --- codex/codex.go | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 4e3125a..a13aab4 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ NIM_CODEX_LIB_DIR := $(abspath $(NIM_CODEX_DIR)/library) NIM_CODEX_BUILD_DIR := $(abspath $(NIM_CODEX_DIR)/build) CGO_CFLAGS := -I$(NIM_CODEX_LIB_DIR) -CGO_LDFLAGS := -L$(NIM_CODEX_BUILD_DIR) -Wl,-rpath,$(NIM_CODEX_BUILD_DIR) +CGO_LDFLAGS := -L$(NIM_CODEX_BUILD_DIR) -lcodex -Wl,-rpath,$(NIM_CODEX_BUILD_DIR) .PHONY: all clean update libcodex build test @@ -25,11 +25,11 @@ libcodex: build: @echo "Building Codex Go Bindings..." - CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go build -o codex-go ./codex + CGO_ENABLED=1 CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go build -o codex-go main.go test: @echo "Running tests..." - CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go test ./... + CGO_ENABLED=1 CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go test ./... clean: @echo "Cleaning up..." diff --git a/codex/bridge.go b/codex/bridge.go index 7e2263c..e685d35 100644 --- a/codex/bridge.go +++ b/codex/bridge.go @@ -1,9 +1,6 @@ package codex /* - #cgo LDFLAGS: -L../vendor/nim-codex/build/ -lcodex - #cgo LDFLAGS: -L../vendor/nim-codex/ -Wl,-rpath,../vendor/nim-codex/build - #include #include #include "libcodex.h" diff --git a/codex/codex.go b/codex/codex.go index 0bd5e28..78e8a2b 100644 --- a/codex/codex.go +++ b/codex/codex.go @@ -1,9 +1,6 @@ package codex /* - #cgo LDFLAGS: -L../vendor/nim-codex/build/ -lcodex - #cgo LDFLAGS: -L../vendor/nim-codex/ -Wl,-rpath,../vendor/nim-codex/ - #include "bridge.h" #include