summaryrefslogtreecommitdiff
path: root/bin/build-python
diff options
context:
space:
mode:
authorKaalleen <reni@allenka.de>2022-02-18 16:18:10 +0100
committerKaalleen <reni@allenka.de>2022-05-04 19:11:40 +0200
commitd4bead109ec4c693da0f47b9c0fddbc631a533cb (patch)
tree9c0ab8b34373350e67437575c55771d95cb73a02 /bin/build-python
parent515ed3ea2fc8357482527d6e4a170db154baa205 (diff)
test to build with specified arch (macOS)
Diffstat (limited to 'bin/build-python')
-rwxr-xr-xbin/build-python6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/build-python b/bin/build-python
index 195248c3..3cc3139b 100755
--- a/bin/build-python
+++ b/bin/build-python
@@ -38,7 +38,13 @@ pyinstaller_args+="--log-level DEBUG "
# This adds bundle identifier in reverse DSN format for macos
if [ "$BUILD" = "osx" ]; then
pyinstaller_args+="--osx-bundle-identifier org.inkstitch.app "
+<<<<<<< HEAD
pyinstaller_args+="-i electron/build/icons/mac/inkstitch.icns"
+=======
+ # in macOS we get an error when building libgfortran: incompatible with target arch x86_64 (has arch: arm64)!
+ # let's try if this fixes it
+ pyinstaller_args+="--target-arch x86_64 "
+>>>>>>> bcf63fec (test to build with specified arch (macOS))
if [[ -z ${GITHUB_REF} ]]; then
echo "Dev or Local Build"
else