Commits

mattip committed 2724048 Merge

merge heads

  • Participants
  • Parent commits d03659a, fecea0b

Comments (0)

Files changed (2)

lib_pypy/_tkinter/tklib.py

     incdirs = []
     linklibs = ['tcl85', 'tk85']
     libdirs = []
+elif sys.platform == 'darwin':
+    incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/']
+    linklibs = ['tcl', 'tk']
+    libdirs = []
 else:
     incdirs=['/usr/include/tcl']
     linklibs=['tcl', 'tk']

pypy/doc/whatsnew-head.rst

 =======================
 
 .. this is a revision shortly after release-2.3.x
-.. startrev: ec864bd08d50
+.. startrev: b2cc67adbaad