diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lldbtest.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbtest.py | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index 7a7afec..591e834 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -1473,11 +1473,12 @@ class Base(unittest.TestCase): d = { "CXX_SOURCES": sources, "EXE": exe_name, - "CFLAGS_EXTRAS": "%s %s -I%s" + "CFLAGS_EXTRAS": "%s %s -I%s -I%s" % ( stdflag, stdlibflag, os.path.join(os.environ["LLDB_SRC"], "include"), + os.path.join(configuration.lldb_obj_root, "include"), ), "LD_EXTRAS": "-L%s -lliblldb" % lib_dir, } @@ -1485,11 +1486,12 @@ class Base(unittest.TestCase): d = { "CXX_SOURCES": sources, "EXE": exe_name, - "CFLAGS_EXTRAS": "%s %s -I%s" + "CFLAGS_EXTRAS": "%s %s -I%s -I%s" % ( stdflag, stdlibflag, os.path.join(os.environ["LLDB_SRC"], "include"), + os.path.join(configuration.lldb_obj_root, "include"), ), "LD_EXTRAS": "-L%s -llldb -Wl,-rpath,%s" % (lib_dir, lib_dir), } @@ -1508,7 +1510,8 @@ class Base(unittest.TestCase): d = { "DYLIB_CXX_SOURCES": sources, "DYLIB_NAME": lib_name, - "CFLAGS_EXTRAS": "%s -stdlib=libc++" % stdflag, + "CFLAGS_EXTRAS": "%s -stdlib=libc++ -I%s" + % (stdflag, os.path.join(configuration.lldb_obj_root, "include")), "FRAMEWORK_INCLUDES": "-F%s" % self.framework_dir, "LD_EXTRAS": "%s -Wl,-rpath,%s -dynamiclib" % (self.lib_lldb, self.framework_dir), @@ -1517,16 +1520,24 @@ class Base(unittest.TestCase): d = { "DYLIB_CXX_SOURCES": sources, "DYLIB_NAME": lib_name, - "CFLAGS_EXTRAS": "%s -I%s " - % (stdflag, os.path.join(os.environ["LLDB_SRC"], "include")), + "CFLAGS_EXTRAS": "%s -I%s -I%s" + % ( + stdflag, + os.path.join(os.environ["LLDB_SRC"], "include"), + os.path.join(configuration.lldb_obj_root, "include"), + ), "LD_EXTRAS": "-shared -l%s\liblldb.lib" % lib_dir, } else: d = { "DYLIB_CXX_SOURCES": sources, "DYLIB_NAME": lib_name, - "CFLAGS_EXTRAS": "%s -I%s -fPIC" - % (stdflag, os.path.join(os.environ["LLDB_SRC"], "include")), + "CFLAGS_EXTRAS": "%s -I%s -I%s -fPIC" + % ( + stdflag, + os.path.join(os.environ["LLDB_SRC"], "include"), + os.path.join(configuration.lldb_obj_root, "include"), + ), "LD_EXTRAS": "-shared -L%s -llldb -Wl,-rpath,%s" % (lib_dir, lib_dir), } if self.TraceOn(): |