Skip to content

Commit 62e2d9c

Browse files
committed
Revert "fix: disable Arm builds for Mac and Windows"
This reverts commit 867e65d.
1 parent 9f7eee0 commit 62e2d9c

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.github/workflows/CI.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ jobs:
5353
zmq_draft: false
5454
zmq_version: 4.3.4
5555

56-
# - os: macos-11
57-
# node_version: 18
58-
# node_arch: x64
59-
# ARCH: arm64
60-
# cpp_arch: amd64_arm64
61-
# zmq_draft: false
62-
# zmq_version: 4.3.4
56+
- os: macos-11
57+
node_version: 18
58+
node_arch: x64
59+
ARCH: arm64
60+
cpp_arch: amd64_arm64
61+
zmq_draft: false
62+
zmq_version: 4.3.4
6363

6464
env:
6565
ZMQ_VERSION: ${{ matrix.zmq_version }}

binding.gyp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@
126126
],
127127
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
128128
'GCC_ENABLE_EXCEPTIONS': 'YES',
129-
# 'OTHER_CFLAGS': [
130-
# "<!(echo \"-arch ${ARCH:=x86_64}\")",
131-
# ],
132-
# 'OTHER_LDFLAGS': [
133-
# "<!(echo \"-arch ${ARCH:=x86_64}\")",
134-
# ]
129+
'OTHER_CFLAGS': [
130+
"<!(echo \"-arch ${ARCH:=x86_64}\")",
131+
],
132+
'OTHER_LDFLAGS': [
133+
"<!(echo \"-arch ${ARCH:=x86_64}\")",
134+
]
135135
},
136136
}],
137137

@@ -219,12 +219,12 @@
219219
'DEAD_CODE_STRIPPING': 'YES',
220220
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
221221
'GCC_ENABLE_EXCEPTIONS': 'YES',
222-
# 'OTHER_CFLAGS': [
223-
# "<!(echo \"-arch ${ARCH:=x86_64}\")",
224-
# ],
225-
# 'OTHER_LDFLAGS': [
226-
# "<!(echo \"-arch ${ARCH:=x86_64}\")",
227-
# ]
222+
'OTHER_CFLAGS': [
223+
"<!(echo \"-arch ${ARCH:=x86_64}\")",
224+
],
225+
'OTHER_LDFLAGS': [
226+
"<!(echo \"-arch ${ARCH:=x86_64}\")",
227+
]
228228
},
229229
}],
230230

0 commit comments

Comments
 (0)