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

Cleaned up my previous submission which had some header search paths that 

were not needed and fixed a merge issue.

llvm-svn: 112626
This commit is contained in:
Greg Clayton 2010-08-31 18:56:24 +00:00
parent 048efbe225
commit bda8065107
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2812,10 +2812,7 @@
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (
/System/Library/Frameworks/System.framework/PrivateHeaders,
/usr/include/python2.6,
);
HEADER_SEARCH_PATHS = /usr/include/python2.6;
INFOPLIST_FILE = "resources/LLDB-Info.plist";
INSTALL_PATH = /Developer/Library/PrivateFrameworks;
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
@ -2868,10 +2865,7 @@
GCC_ENABLE_OBJC_GC = supported;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (
/System/Library/Frameworks/System.framework/PrivateHeaders,
/usr/include/python2.6,
);
HEADER_SEARCH_PATHS = /usr/include/python2.6;
INFOPLIST_FILE = "resources/LLDB-Info.plist";
INSTALL_PATH = /Developer/Library/PrivateFrameworks;
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";
@ -2981,10 +2975,7 @@
GCC_ENABLE_OBJC_GC = supported;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (
/System/Library/Frameworks/System.framework/PrivateHeaders,
/usr/include/python2.6,
);
HEADER_SEARCH_PATHS = /usr/include/python2.6;
INFOPLIST_FILE = "resources/LLDB-Info.plist";
INSTALL_PATH = /Developer/Library/PrivateFrameworks;
LD_DYLIB_INSTALL_NAME = "@rpath/LLDB.framework/Versions/A/LLDB";

4
lldb/source/Host/macosx/Host.mm
View File

@ -834,6 +834,7 @@ Host::OpenFileInExternalEditor (FileSpec &file_spec, uint32_t line_no)
file_and_line_desc.descKey = keyAEPosition;
static std::string g_app_name;
static FSRef g_app_fsref;
LSApplicationParameters app_params;
@ -846,11 +847,10 @@ Host::OpenFileInExternalEditor (FileSpec &file_spec, uint32_t line_no)
if (external_editor)
{
bool calculate_fsref = true;
if (log)
log->Printf("Looking for external editor \"%s\".\n", external_editor);
if (app_name.empty() || strcmp (app_name.c_str(), external_editor) != 0)
if (g_app_name.empty() || strcmp (g_app_name.c_str(), external_editor) != 0)
{
CFCString editor_name (external_editor, kCFStringEncodingUTF8);
error = ::LSFindApplicationForInfo (kLSUnknownCreator,