diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-12-08 01:10:12 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-12-08 01:10:12 (GMT) |
| commit | c8607b76f0465d91998add0c3b13be59b7a4bce7 (patch) | |
| tree | a4dd088ef1f7bbe582f7225e2bf5fe0dd862079f /configure | |
| parent | 48e02e4c395c6119b6f6240593607103d4300ff3 (diff) | |
| download | cpython-c8607b76f0465d91998add0c3b13be59b7a4bce7.zip cpython-c8607b76f0465d91998add0c3b13be59b7a4bce7.tar.gz cpython-c8607b76f0465d91998add0c3b13be59b7a4bce7.tar.bz2 | |
Revamped framework search path handling for MacOSX. This should allow
two framework builds (in /Library and /System/Library) to coexist
with distutils linking against the right one.
Should be backported to 2.3, but getting Apple-supplied Python to pick
up these fixes is going to be non-trivial.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.440 . +# From configure.in Revision: 1.441 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for python 2.4. # @@ -9991,7 +9991,6 @@ then BASECFLAGS="$BASECFLAGS -fno-common -dynamic" # -F. is needed to allow linking to the framework while # in the build location. - LDFLAGS="$LDFLAGS -Wl,-F." cat >>confdefs.h <<\_ACEOF #define WITH_NEXT_FRAMEWORK 1 @@ -10085,7 +10084,8 @@ then LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. - LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' + BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)' + LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework. Ignore undefined symbols, assuming they come from Python LDSHARED="$LDSHARED -undefined suppress" @@ -10094,7 +10094,8 @@ then LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. - LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' + BLDSHARED="$LDSHARED "'-Wl,-F. -framework $(PYTHONFRAMEWORK)' + LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' @@ -10191,7 +10192,7 @@ then LINKFORSHARED="$extra_undefs -framework System" if test "$enable_framework" then - LINKFORSHARED="$LINKFORSHARED -framework Python" + LINKFORSHARED="$LINKFORSHARED -Wl,-F. -framework Python" fi LINKFORSHARED="$LINKFORSHARED $extra_frameworks";; OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";; |