Skip to content

Commit 2c9564a

Browse files
committed
Simplify macOs setup
We no longer use cross-compilation, so remove macOs-specific compilation flags.
1 parent d911a8e commit 2c9564a

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
include:
12-
- os: macos-latest
12+
- os: macos-14
1313
arch: arm64
14-
- os: macos-latest
14+
- os: macos-13
1515
arch: x86_64
1616
- os: ubuntu-latest
1717
arch: aarch64

scripts/build-codecs.py

+2-15
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,6 @@ def run(cmd):
9292
os.chdir(build_dir)
9393

9494
prepend_env("PATH", os.path.join(dest_dir, "bin"), separator=":")
95-
if platform.system() == "Darwin" and os.environ.get("ARCHFLAGS") == "-arch arm64":
96-
opus_configure_args = [
97-
"--build",
98-
"x86_64-apple-darwin20.6.0",
99-
"--host",
100-
"amd64-apple-darwin20.6.0",
101-
]
102-
vpx_configure_args = ["--target=arm64-darwin20-gcc"]
103-
else:
104-
opus_configure_args = []
105-
vpx_configure_args = []
10695

10796
#### BUILD TOOLS ####
10897

@@ -127,8 +116,7 @@ def run(cmd):
127116
"--disable-shared",
128117
"--enable-static",
129118
"--with-pic",
130-
]
131-
+ opus_configure_args,
119+
],
132120
)
133121

134122
# build vpx
@@ -140,8 +128,7 @@ def run(cmd):
140128
"--disable-tools",
141129
"--disable-unit-tests",
142130
"--enable-pic",
143-
]
144-
+ vpx_configure_args,
131+
],
145132
)
146133

147134
run(["tar", "czvf", output_tarball, "-C", dest_dir, "include", "lib"])

0 commit comments

Comments
 (0)