diff --git a/lldb.xcodeproj/project.pbxproj b/lldb.xcodeproj/project.pbxproj
index 757c58d860..a220263b28 100644
--- a/lldb.xcodeproj/project.pbxproj
+++ b/lldb.xcodeproj/project.pbxproj
@@ -9055,8 +9055,8 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH = "$(SDKROOT)/System/Library/Frameworks/Python.framework";
- PYTHON_VERSION_MAJOR = 2;
+ PYTHON_FRAMEWORK_PATH = "/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions";
+ PYTHON_VERSION_MAJOR = 3;
PYTHON_VERSION_MINOR = 7;
SDKROOT = macosx;
"SDKROOT[arch=x86_64]" = macosx;
@@ -9183,8 +9183,8 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH = "$(SDKROOT)/System/Library/Frameworks/Python.framework";
- PYTHON_VERSION_MAJOR = 2;
+ PYTHON_FRAMEWORK_PATH = "/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions";
+ PYTHON_VERSION_MAJOR = 3;
PYTHON_VERSION_MINOR = 7;
SDKROOT = macosx;
"SDKROOT[arch=x86_64]" = macosx;
@@ -9448,7 +9448,7 @@
"$(OTHER_CFLAGS)",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"-DDT_VARIANT_$(DT_VARIANT)",
@@ -9467,8 +9467,8 @@
);
"OTHER_LDFLAGS[sdk=macosx*]" = (
"$(inherited)",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
"-framework",
@@ -9537,7 +9537,7 @@
"-DSWIFT_ENABLE_OBJECT_LITERALS",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -9598,7 +9598,7 @@
MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -9622,8 +9622,8 @@
"$(inherited)",
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -9803,7 +9803,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -9816,8 +9816,8 @@
OTHER_LDFLAGS = (
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -10458,7 +10458,7 @@
"LLVM_BUILD_DIR_ARCH[sdk=iphoneos*]" = "llvm-iphoneos-$(CURRENT_ARCH)/";
"LLVM_BUILD_DIR_ARCH[sdk=watchos*]" = "llvm-watchos-$(CURRENT_ARCH)/";
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"-DDT_VARIANT_$(DT_VARIANT)",
@@ -10482,8 +10482,8 @@
);
"OTHER_LDFLAGS[sdk=macosx*]" = (
"$(inherited)",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
"-framework",
@@ -10546,7 +10546,7 @@
"LLVM_BUILD_DIR_ARCH[sdk=iphoneos*]" = "llvm-iphoneos-$(CURRENT_ARCH)/";
"LLVM_BUILD_DIR_ARCH[sdk=watchos*]" = "llvm-watchos-$(CURRENT_ARCH)/";
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"-DDT_VARIANT_$(DT_VARIANT)",
@@ -10570,8 +10570,8 @@
);
"OTHER_LDFLAGS[sdk=macosx*]" = (
"$(inherited)",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
"-framework",
@@ -10679,7 +10679,7 @@
"-DSWIFT_ENABLE_OBJECT_LITERALS",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -10731,7 +10731,7 @@
"-DSWIFT_ENABLE_OBJECT_LITERALS",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -10783,7 +10783,7 @@
"-DSWIFT_ENABLE_OBJECT_LITERALS",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -10919,8 +10919,8 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH = "$(SDKROOT)/System/Library/Frameworks/Python.framework";
- PYTHON_VERSION_MAJOR = 2;
+ PYTHON_FRAMEWORK_PATH = "/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions";
+ PYTHON_VERSION_MAJOR = 3;
PYTHON_VERSION_MINOR = 7;
SDKROOT = macosx;
"SDKROOT[arch=x86_64]" = macosx;
@@ -11018,7 +11018,7 @@
"LLVM_BUILD_DIR_ARCH[sdk=iphoneos*]" = "llvm-iphoneos-$(CURRENT_ARCH)/";
"LLVM_BUILD_DIR_ARCH[sdk=watchos*]" = "llvm-watchos-$(CURRENT_ARCH)/";
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"-DDT_VARIANT_$(DT_VARIANT)",
@@ -11042,8 +11042,8 @@
);
"OTHER_LDFLAGS[sdk=macosx*]" = (
"$(inherited)",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
"-framework",
@@ -11339,7 +11339,7 @@
MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -11363,8 +11363,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -11427,7 +11427,7 @@
MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -11451,8 +11451,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -11511,7 +11511,7 @@
MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -11535,8 +11535,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -11930,8 +11930,8 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH = "$(SDKROOT)/System/Library/Frameworks/Python.framework";
- PYTHON_VERSION_MAJOR = 2;
+ PYTHON_FRAMEWORK_PATH = "/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions";
+ PYTHON_VERSION_MAJOR = 3;
PYTHON_VERSION_MINOR = 7;
SDKROOT = macosx;
"SDKROOT[arch=x86_64]" = macosx;
@@ -12037,7 +12037,7 @@
"LLVM_BUILD_DIR_ARCH[sdk=iphoneos*]" = "llvm-iphoneos-$(CURRENT_ARCH)/";
"LLVM_BUILD_DIR_ARCH[sdk=watchos*]" = "llvm-watchos-$(CURRENT_ARCH)/";
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"-DDT_VARIANT_$(DT_VARIANT)",
@@ -12061,8 +12061,8 @@
);
"OTHER_LDFLAGS[sdk=macosx*]" = (
"$(inherited)",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
"-framework",
@@ -12126,7 +12126,7 @@
"-DSWIFT_ENABLE_OBJECT_LITERALS",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -12193,7 +12193,7 @@
MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -12217,8 +12217,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -12626,8 +12626,8 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH = "$(SDKROOT)/System/Library/Frameworks/Python.framework";
- PYTHON_VERSION_MAJOR = 2;
+ PYTHON_FRAMEWORK_PATH = "/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions";
+ PYTHON_VERSION_MAJOR = 3;
PYTHON_VERSION_MINOR = 7;
SDKROOT = macosx;
"SDKROOT[arch=x86_64]" = macosx;
@@ -12734,7 +12734,7 @@
"LLVM_BUILD_DIR_ARCH[sdk=iphoneos*]" = "llvm-iphoneos-$(CURRENT_ARCH)/";
"LLVM_BUILD_DIR_ARCH[sdk=watchos*]" = "llvm-watchos-$(CURRENT_ARCH)/";
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -12757,8 +12757,8 @@
);
"OTHER_LDFLAGS[sdk=macosx*]" = (
"$(inherited)",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
"-framework",
@@ -12822,7 +12822,7 @@
"-DSWIFT_ENABLE_OBJECT_LITERALS",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -12890,7 +12890,7 @@
MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -12915,8 +12915,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -13114,7 +13114,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -13128,8 +13128,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -13223,7 +13223,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -13236,8 +13236,8 @@
OTHER_LDFLAGS = (
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -13299,7 +13299,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -13313,8 +13313,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -13371,7 +13371,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -13385,8 +13385,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -13450,7 +13450,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -13464,8 +13464,8 @@
"$(inherited)",
"-filelist",
"$(LLVM_BUILD_DIR)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -13608,8 +13608,8 @@
"-framework",
Foundation,
);
- PYTHON_FRAMEWORK_PATH = "$(SDKROOT)/System/Library/Frameworks/Python.framework";
- PYTHON_VERSION_MAJOR = 2;
+ PYTHON_FRAMEWORK_PATH = "/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions";
+ PYTHON_VERSION_MAJOR = 3;
PYTHON_VERSION_MINOR = 7;
SDKROOT = macosx;
"SDKROOT[arch=x86_64]" = macosx;
@@ -13717,7 +13717,7 @@
"-Wparentheses",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"-DDT_VARIANT_$(DT_VARIANT)",
@@ -13742,8 +13742,8 @@
);
"OTHER_LDFLAGS[sdk=macosx*]" = (
"$(inherited)",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
"-framework",
@@ -13806,7 +13806,7 @@
"-DSWIFT_ENABLE_OBJECT_LITERALS",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -13869,7 +13869,7 @@
MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-Wparentheses",
);
"OTHER_CFLAGS[sdk=iphoneos*]" = (
@@ -13891,8 +13891,8 @@
"$(inherited)",
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -14054,7 +14054,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-flimit-debug-info",
"-Wparentheses",
);
@@ -14067,8 +14067,8 @@
OTHER_LDFLAGS = (
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -14209,8 +14209,8 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COMPRESSION_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH = "$(SDKROOT)/System/Library/Frameworks/Python.framework";
- PYTHON_VERSION_MAJOR = 2;
+ PYTHON_FRAMEWORK_PATH = "/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions";
+ PYTHON_VERSION_MAJOR = 3;
PYTHON_VERSION_MINOR = 7;
SDKROOT = macosx;
"SDKROOT[arch=x86_64]" = macosx;
@@ -14312,7 +14312,7 @@
"LLVM_BUILD_DIR_ARCH[sdk=iphoneos*]" = "llvm-iphoneos-$(CURRENT_ARCH)/";
"LLVM_BUILD_DIR_ARCH[sdk=watchos*]" = "llvm-watchos-$(CURRENT_ARCH)/";
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"-DDT_VARIANT_$(DT_VARIANT)",
@@ -14336,8 +14336,8 @@
);
"OTHER_LDFLAGS[sdk=macosx*]" = (
"$(inherited)",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
"-framework",
@@ -14406,7 +14406,7 @@
"-DSWIFT_ENABLE_OBJECT_LITERALS",
);
OTHER_CPLUSPLUSFLAGS = (
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-fno-rtti",
"-Wglobal-constructors",
"$(OTHER_CFLAGS)",
@@ -14467,7 +14467,7 @@
MACH_O_TYPE = mh_execute;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-Wparentheses",
);
"OTHER_CFLAGS[sdk=iphoneos*]" = (
@@ -14489,8 +14489,8 @@
"$(inherited)",
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
@@ -14634,7 +14634,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = (
"$(inherited)",
- "-I/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
+ "-I/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/include/python3.7m",
"-Wparentheses",
);
"OTHER_CFLAGS[sdk=iphoneos*]" = (
@@ -14645,8 +14645,8 @@
OTHER_LDFLAGS = (
"-filelist",
"$(LLDB_PATH_TO_LLVM_BUILD)/archives.txt",
- "-L/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config",
- "-lpython2.7",
+ "-L/usr/local/Cellar/python/3.7.0/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin",
+ "-lpython3.7",
"-lxml2",
"-framework",
DebugSymbols,
diff --git a/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp b/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
index 6a9d57d5a3..8dc43322de 100644
--- a/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
+++ b/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
@@ -399,7 +399,7 @@ llvm::StringRef PythonString::GetString() const {
return llvm::StringRef();
Py_ssize_t size;
- char *c;
+ const char *c;
#if PY_MAJOR_VERSION >= 3
c = PyUnicode_AsUTF8AndSize(m_py_obj, &size);