Skip to content

Commit 2a4864c

Browse files
committed
Reenable mac and try better windows detection
1 parent afd7d2f commit 2a4864c

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
name: linux
2121
lib_ext: so
2222

23-
# - os: macos-latest
24-
# lib_ext: so
25-
# name: macos
26-
# cpu: arm64
23+
- os: macos-latest
24+
lib_ext: so
25+
name: macos
26+
cpu: arm64
2727

2828
- os: windows-latest
2929
cpu: amd64

Makefile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@ LIBS_DIR := $(abspath ./libs)
44
UNAME_S := $(shell uname -s)
55

66
# Flags for CGO to find the headers and the shared library
7-
ifeq ($(UNAME_S),Darwin)
8-
CGO_CFLAGS := -I$(LIBS_DIR)
9-
CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,@executable_path/./libs
10-
else
11-
CGO_CFLAGS := -I$(LIBS_DIR)
12-
CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,$(LIBS_DIR)
13-
endif
14-
15-
ifeq ($(OS),windows)
7+
# ifeq ($(UNAME_S),Darwin)
8+
# CGO_CFLAGS := -I$(LIBS_DIR)
9+
# CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,@executable_path/./libs
10+
# else
11+
# CGO_CFLAGS := -I$(LIBS_DIR)
12+
# CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,$(LIBS_DIR)
13+
# endif
14+
CGO_CFLAGS := -I$(LIBS_DIR)
15+
CGO_LDFLAGS := -L$(LIBS_DIR) -lcodex -Wl,-rpath,$(LIBS_DIR)
16+
17+
ifeq ($(OS),Windows_NT)
1618
BIN_NAME := example.exe
1719
else
1820
BIN_NAME := example

0 commit comments

Comments
 (0)