Skip to content

Commit

Permalink
fix: build workflow fix for missing symbols (#87)
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelOsborne authored Feb 21, 2024
1 parent ea94b50 commit 1afe675
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
if: github.event.inputs.target == 'apple' || github.event.inputs.target == 'all'
env:
APPLE_MACOSX_SDK: MacOSX13
run: rm /usr/local/lib/libjpeg* ; make apple
run: rm -f /usr/local/lib/libjpeg* ; make apple

- name: Upload Apple Artifacts
uses: actions/upload-artifact@v3
Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,11 @@ define CMAKE_BUILD
cmake --build $(CMAKE_BUILD_DIR) --config Release --target install -- $(CMAKE_BUILD_OPTIONS)
endef

define CLEAN_LIBGJPEG
echo "Removing libjpeg from rm /usr/local/lib/libjpeg*"
rm -f /usr/local/lib/libjpeg*
endef

define CARGO_BUILD
source $(EMSDK_DIR)/$(EMSDK)_env.sh && \
cargo build \
Expand Down Expand Up @@ -527,6 +532,7 @@ $4/$(CMAKE_CACHE):
$$(SETUP_CMAKE)

# Build
$(call CLEAN_LIBGJPEG)
$$($1_DEPS_LIB_DIR)/$5: CMAKE_BUILD_DIR := $4
$$($1_DEPS_LIB_DIR)/$5: CMAKE_BUILD_OPTIONS := $(if $(filter $($1_SUBSYSTEM),$(APPLE_IOS)),CODE_SIGNING_ALLOWED=NO,)
$$($1_DEPS_LIB_DIR)/$5: $4/$(CMAKE_CACHE)
Expand Down

0 comments on commit 1afe675

Please sign in to comment.