This is an archive of the discontinued LLVM Phabricator instance.

Don't compile scripts directory if LLDB_DISABLE_PYTHON is set
ClosedPublic

Authored by labath on Apr 7 2015, 2:53 AM.

Download Raw Diff

Details

Reviewers

Commits

rGe4651eb0331d: Don't compile scripts directory if LLDB_DISABLE_PYTHON is set
rLLDB234319: Don't compile scripts directory if LLDB_DISABLE_PYTHON is set
rL234319: Don't compile scripts directory if LLDB_DISABLE_PYTHON is set

Summary

What looks like a typo has caused the scripts/Python directory to be compiled on non-Windows
platforms even with LLDB_DISABLE_PYTHON, which failed if Python.h was unavaiable. This changes
the condition to avoid compilation if LLDB_DISABLE_PYTHON is set.

Diff Detail

Repository: rL LLVM

Event Timeline

labath updated this revision to Diff 23317.Apr 7 2015, 2:53 AM

labath retitled this revision from to Don't compile scripts directory if LLDB_DISABLE_PYTHON is set.

labath updated this object.

labath edited the test plan for this revision. (Show Details)

labath added a reviewer: zturner.

labath added a subscriber: Unknown Object (MLST).

Lgtm

Closed by commit rL234319: Don't compile scripts directory if LLDB_DISABLE_PYTHON is set (authored by labath). · Explain WhyApr 7 2015, 7:58 AM

This revision was automatically updated to reflect the committed changes.

Actually sorry, the new check doesn't make sense either, now windows will
never include it. Can you change it to just if NOT LLDB_DISABLE_PYTHON

No problem. Commited as r234321.

Revision Contents

Path

Size

lldb/

trunk/

CMakeLists.txt

2 lines

Diff 23340

lldb/trunk/CMakeLists.txt

	include(cmake/modules/LLDBConfig.cmake)			include(cmake/modules/LLDBConfig.cmake)
	include(cmake/modules/LLDBStandalone.cmake)			include(cmake/modules/LLDBStandalone.cmake)
	include(cmake/modules/AddLLDB.cmake)			include(cmake/modules/AddLLDB.cmake)

	#add_subdirectory(include)			#add_subdirectory(include)
	add_subdirectory(docs)			add_subdirectory(docs)
	if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" OR NOT LLDB_DISABLE_PYTHON)			if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" AND NOT LLDB_DISABLE_PYTHON)
	add_subdirectory(scripts)			add_subdirectory(scripts)
	endif ()			endif ()
	add_subdirectory(source)			add_subdirectory(source)
	add_subdirectory(test)			add_subdirectory(test)
	add_subdirectory(tools)			add_subdirectory(tools)
	add_subdirectory(unittests)			add_subdirectory(unittests)
	add_subdirectory(lit)			add_subdirectory(lit)

	Show All 9 Lines