maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Change the "Debug" build to use the current MacOSX SDK. Fix the swig builder to have an explicit 

short-circuit of the Python SWIG building, rather than relying on the SDKROOT being set.

llvm-svn: 157363
This commit is contained in:
Jim Ingham 2012-05-24 01:16:09 +00:00
parent c11535c248
commit 777e6d01ea
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/lldb.xcodeproj/project.pbxproj
View File

@ -4058,6 +4058,8 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LLDB_DISABLE_PYTHON = 0;
"LLDB_DISABLE_PYTHON[sdk=iphoneos*]" = 1;
LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
LLDB_TOOLS_INSTALL_DIR = /usr/bin;
LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)";
@ -4069,6 +4071,7 @@
"-flimit-debug-info",
"-Wparentheses",
);
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = debugging;
VALID_ARCHS = "armv4t armv5 armv6 armv7 armv7s i386 ppc ppc64 ppc7400 ppc970 x86_64";
@ -4111,6 +4114,8 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LLDB_DISABLE_PYTHON = 0;
"LLDB_DISABLE_PYTHON[sdk=iphoneos*]" = 1;
LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
LLDB_TOOLS_INSTALL_DIR = /usr/bin;
LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)";
@ -4475,6 +4480,8 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LLDB_DISABLE_PYTHON = 0;
"LLDB_DISABLE_PYTHON[sdk=iphoneos*]" = 1;
LLDB_FRAMEWORK_INSTALL_DIR = /Applications/Xcode.app/Contents/SharedFrameworks;
"LLDB_FRAMEWORK_INSTALL_DIR[sdk=iphoneos*]" = /System/Library/PrivateFrameworks;
LLDB_TOOLS_INSTALL_DIR = /Applications/Xcode.app/Contents/Developer/usr/bin;

11
lldb/scripts/Python/build-swig-Python.sh
View File

@ -24,7 +24,12 @@ swig_python_extensions=${SRC_ROOT}/scripts/Python/python-extensions.swig
swig_python_wrapper=${SRC_ROOT}/scripts/Python/python-wrapper.swig
swig_python_typemaps=${SRC_ROOT}/scripts/Python/python-typemaps.swig
if [ "x$SDKROOT" = "x" ] ; then
if [ $LLDB_DISABLE_PYTHON = "1" ] ; then
# SDKROOT was not empty, which currently means iOS cross build where python is disabled
rm -rf ${swig_output_file}
touch ${swig_output_file}
else
if [ -n "$debug_flag" -a "$debug_flag" == "-debug" ]
then
@ -303,8 +308,4 @@ then
fi
fi
else
# SDKROOT was not empty, which currently means iOS cross build where python is disabled
rm -rf ${swig_output_file}
touch ${swig_output_file}
fi