File tree Expand file tree Collapse file tree 5 files changed +11
-2
lines changed
packages/Python/lldbsuite/test Expand file tree Collapse file tree 5 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ set(LLDB_INCLUDE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include")
7
7
8
8
set (LLDB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
9
9
set (LLDB_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} )
10
+ set (LLDB_OBJ_DIR ${CMAKE_CURRENT_BINARY_DIR} )
10
11
11
12
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
12
13
message (FATAL_ERROR
Original file line number Diff line number Diff line change @@ -71,6 +71,7 @@ endif()
71
71
# At configuration time, collect headers for the framework bundle and copy them
72
72
# into a staging directory. Later we can copy over the entire folder.
73
73
file (GLOB public_headers ${LLDB_SOURCE_DIR} /include/lldb/API/*.h )
74
+ set (generated_public_headers ${LLDB_OBJ_DIR} /include/lldb/API/SBLanguages.h )
74
75
file (GLOB root_public_headers ${LLDB_SOURCE_DIR} /include/lldb/lldb-*.h )
75
76
file (GLOB root_private_headers ${LLDB_SOURCE_DIR} /include/lldb/lldb-private*.h )
76
77
list (REMOVE_ITEM root_public_headers ${root_private_headers} )
@@ -80,6 +81,7 @@ find_program(unifdef_EXECUTABLE unifdef)
80
81
set (lldb_header_staging ${CMAKE_CURRENT_BINARY_DIR} /FrameworkHeaders )
81
82
foreach (header
82
83
${public_headers}
84
+ ${generated_public_headers}
83
85
${root_public_headers} )
84
86
85
87
get_filename_component (basename ${header} NAME )
Original file line number Diff line number Diff line change 40
40
#include " lldb/API/SBInstruction.h"
41
41
#include " lldb/API/SBInstructionList.h"
42
42
#include " lldb/API/SBLanguageRuntime.h"
43
+ #include " lldb/API/SBLanguages.h"
43
44
#include " lldb/API/SBLaunchInfo.h"
44
45
#include " lldb/API/SBLineEntry.h"
45
46
#include " lldb/API/SBListener.h"
Original file line number Diff line number Diff line change @@ -175,6 +175,9 @@ def getLLDBSwiftLibs(self):
175
175
return ["SWIFT_LIBS_DIR={}" .format (configuration .swift_libs_dir )]
176
176
return []
177
177
178
+ def getLLDBObjRoot (self ):
179
+ return ["LLDB_OBJ_ROOT={}" .format (configuration .lldb_obj_root )]
180
+
178
181
def _getDebugInfoArgs (self , debug_info ):
179
182
if debug_info is None :
180
183
return []
@@ -216,6 +219,7 @@ def getBuildCommand(
216
219
self .getModuleCacheSpec (),
217
220
self .getLibCxxArgs (),
218
221
self .getLLDBSwiftLibs (),
222
+ self .getLLDBObjRoot (),
219
223
self .getCmdLine (dictionary ),
220
224
]
221
225
command = list (itertools .chain (* command_parts ))
Original file line number Diff line number Diff line change @@ -270,10 +270,11 @@ ifeq "$(OS)" "Darwin"
270
270
endif
271
271
272
272
ifeq "$(OS)" "Darwin"
273
- CFLAGS += $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES) -I$(LLDB_BASE_DIR)include
273
+ CFLAGS += $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES)
274
274
else
275
- CFLAGS += $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) -I$(LLDB_BASE_DIR)include
275
+ CFLAGS += $(ARCHFLAG)$(ARCH)
276
276
endif
277
+ CFLAGS += -I$(LLDB_BASE_DIR)include -I$(LLDB_OBJ_ROOT)/include
277
278
278
279
CFLAGS += -I$(SRCDIR) -I$(THIS_FILE_DIR)
279
280
You can’t perform that action at this time.
0 commit comments