Skip to content

Commit c67439c

Browse files
committed
rpath fix w/ embedded
1 parent 04152c3 commit c67439c

File tree

2 files changed

+38
-24
lines changed

2 files changed

+38
-24
lines changed

configure

Lines changed: 19 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -728,27 +728,34 @@ AC_ARG_ENABLE([framework],
728728
AC_CONFIG_FILES([Mac/Resources/app/Info.plist])
729729
;;
730730
iOS) :
731-
FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
732-
FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
733-
FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
734-
FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
735-
FRAMEWORKPYTHONW=
736-
INSTALLTARGETS="libinstall inclinstall sharedinstall"
737-
prefix=$PYTHONFRAMEWORKPREFIX
738-
PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
739-
740-
is_mac_catalyst=`echo $host | cut -d '-' -f4`
741-
case $is_mac_catalyst in
731+
_flag_ios_catalyst=`echo $host | cut -d '-' -f4`
732+
case $_flag_ios_catalyst in
742733
macabi)
734+
FRAMEWORKINSTALLFIRST="frameworkinstallversionedstructure"
735+
FRAMEWORKALTINSTALLFIRST="frameworkinstallversionedstructure "
736+
FRAMEWORKINSTALLLAST=""
737+
FRAMEWORKALTINSTALLLAST=""
738+
FRAMEWORKPYTHONW=
739+
INSTALLTARGETS="libinstall inclinstall sharedinstall"
740+
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
741+
PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR/Contents/Versions/$VERSION"
743742
RESSRCDIR=MacCatalyst/Resources
744743
AC_CONFIG_FILES([MacCatalyst/Resources/Info.plist])
745744
;;
746745
*)
746+
FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
747+
FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "
748+
FRAMEWORKINSTALLLAST="frameworkinstallmobileheaders"
749+
FRAMEWORKALTINSTALLLAST="frameworkinstallmobileheaders"
750+
FRAMEWORKPYTHONW=
751+
INSTALLTARGETS="libinstall inclinstall sharedinstall"
752+
prefix=$PYTHONFRAMEWORKPREFIX
753+
PYTHONFRAMEWORKINSTALLNAMEPREFIX="@rpath/$PYTHONFRAMEWORKDIR"
747754
RESSRCDIR=iOS/Resources
748755
AC_CONFIG_FILES([iOS/Resources/Info.plist])
749756
;;
750757
esac
751-
;;
758+
752759
tvOS) :
753760
FRAMEWORKINSTALLFIRST="frameworkinstallunversionedstructure"
754761
FRAMEWORKALTINSTALLFIRST="frameworkinstallunversionedstructure "

0 commit comments

Comments
 (0)