From 7c580dca31731bdb960abc97e4202e96c7aadc37 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 Jan 2017 12:45:33 +0530
Subject: [PATCH] Try and figure out why linking against python is failing on
 OS X Travis

---
 .travis.yml | 9 +++------
 setup.py    | 6 ++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fdf4664db..bc2d38ce1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,9 +47,10 @@ matrix:
 
 install: |
     if [[ "$RUN_FLAKE" == "1" ]]; then pip install flake8; fi
-    if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+    if [[ "$TRAVIS_OS_NAME" == 'osx' ]]; then
         python3 -m venv venv;
         source venv/bin/activate;
+        python3 -m sysconfig
     else
         wget -O glfw-3.2.1.zip https://github.com/glfw/glfw/archive/3.2.1.zip
         unzip glfw-3.2.1.zip
@@ -67,11 +68,7 @@ env:
         - LD_LIBRARY_PATH=$HOME/glfw/lib 
         - ASAN_OPTIONS=leak_check_at_exit=0 
 before_script:
-    - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then 
-        python setup.py build; 
-      else
-        python setup.py build --debug $ASAN_ARG;
-      fi
+    - python setup.py build --debug $ASAN_ARG;
 script: 
     - LD_PRELOAD=$ASANLIB python setup.py test
     - if [[ "$RUN_FLAKE" == "1" ]]; then flake8 --count .; fi
diff --git a/setup.py b/setup.py
index c33542b03..ecdb428fd 100755
--- a/setup.py
+++ b/setup.py
@@ -52,8 +52,10 @@ def get_python_flags(cflags):
         for var in 'data include scripts'.split():
             val = sysconfig.get_path(var)
             if val and '/{}.framework'.format(fw) in val:
-                libs.append('-F' + val[:val.index('/{}.framework'.format(fw))])
-        libs += ['-framework', sysconfig.get_config_var('PYTHONFRAMEWORK')]
+                fdir = val[:val.index('/{}.framework'.format(fw))]
+                libs.append('-F' + fdir)
+                break
+        libs.extend(['-framework', fw])
     else:
         libs += ['-L' + sysconfig.get_config_var('LIBDIR')]
         libs += ['-lpython' + sysconfig.get_config_var('VERSION') + sys.abiflags]