This is an archive of the discontinued LLVM Phabricator instance.

I'd prefer LLVM_USE_STATIC_ZSTD name I suggested in D132870. <PROJECT>_USE_STATIC_<DEPENDENCY> is a common convention we already use elsewhere in LLVM. I'd prefer following the existing conventions rather than inventing a new approach for the sake of maintainability.

change to LLVM_USE_STATIC_ZSTD (default FALSE)

ckissane retitled this revision from use LLVM_ZSTD_PREFERENCE_LIST in favor of LLVM_PREFER_STATIC_ZSTD to use LLVM_ZSTD_PREFERENCE_LIST in favor of LLVM_USE_STATIC_ZSTD.Sep 2 2022, 1:28 PM

ckissane edited the summary of this revision. (Show Details)

ckissane retitled this revision from use LLVM_ZSTD_PREFERENCE_LIST in favor of LLVM_USE_STATIC_ZSTD to use LLVM_USE_STATIC_ZSTD.

phosek added inline comments.Sep 2 2022, 1:31 PM

llvm/lib/Support/CMakeLists.txt
27–28	I'd delete this line altogether. In CMake, you don't need to define variables before you use them and there's no suitable default value here.

delete line

LGTM

This revision is now accepted and ready to land.Sep 2 2022, 1:44 PM

This revision was landed with ongoing or failed builds.Sep 2 2022, 2:00 PM

Closed by commit rGfc1da043f4f9: use LLVM_USE_STATIC_ZSTD (authored by ckissane). · Explain Why

This revision was automatically updated to reflect the committed changes.

ckissane added a commit: rGfc1da043f4f9: use LLVM_USE_STATIC_ZSTD.

Harbormaster completed remote builds in B184886: Diff 457692.Sep 2 2022, 2:08 PM

phosek mentioned this in D128465: [llvm] add zstd to `llvm::compression` namespace.Sep 19 2022, 12:32 PM

This change broke the libclc CI job we have for the release branch on MacOS. It looks like the root cause is a change in the output of llvm-config:

Before: -lm;-lz;/usr/local/lib/libzstd.1.5.2.dylib;-lcurses;-lxml2
After: -lm;-lz;-lzstd;-lcurses;-lxml2

Revision Contents

Path

Size

llvm/

CMakeLists.txt

2 lines

lib/

Support/

CMakeLists.txt

16 lines

Diff 457697

llvm/CMakeLists.txt

	Show First 20 Lines • Show All 480 Lines • ▼ Show 20 Lines
	else()			else()
	option(LLVM_ENABLE_THREADS "Use threads if available." ON)			option(LLVM_ENABLE_THREADS "Use threads if available." ON)
	endif()			endif()

	set(LLVM_ENABLE_ZLIB "ON" CACHE STRING "Use zlib for compression/decompression if available. Can be ON, OFF, or FORCE_ON")			set(LLVM_ENABLE_ZLIB "ON" CACHE STRING "Use zlib for compression/decompression if available. Can be ON, OFF, or FORCE_ON")

	set(LLVM_ENABLE_ZSTD "ON" CACHE STRING "Use zstd for compression/decompression if available. Can be ON, OFF, or FORCE_ON")			set(LLVM_ENABLE_ZSTD "ON" CACHE STRING "Use zstd for compression/decompression if available. Can be ON, OFF, or FORCE_ON")

	set(LLVM_PREFER_STATIC_ZSTD TRUE CACHE BOOL "Use static version of zstd if available. Can be TRUE, FALSE")			set(LLVM_USE_STATIC_ZSTD FALSE CACHE BOOL "Use static version of zstd. Can be TRUE, FALSE")

	set(LLVM_ENABLE_CURL "OFF" CACHE STRING "Use libcurl for the HTTP client if available. Can be ON, OFF, or FORCE_ON")			set(LLVM_ENABLE_CURL "OFF" CACHE STRING "Use libcurl for the HTTP client if available. Can be ON, OFF, or FORCE_ON")

	set(LLVM_ENABLE_HTTPLIB "OFF" CACHE STRING "Use cpp-httplib HTTP server library if available. Can be ON, OFF, or FORCE_ON")			set(LLVM_ENABLE_HTTPLIB "OFF" CACHE STRING "Use cpp-httplib HTTP server library if available. Can be ON, OFF, or FORCE_ON")

	set(LLVM_Z3_INSTALL_DIR "" CACHE STRING "Install directory of the Z3 solver.")			set(LLVM_Z3_INSTALL_DIR "" CACHE STRING "Install directory of the Z3 solver.")

	option(LLVM_ENABLE_Z3_SOLVER			option(LLVM_ENABLE_Z3_SOLVER
	▲ Show 20 Lines • Show All 861 Lines • Show Last 20 Lines

llvm/lib/Support/CMakeLists.txt

Show All 18 Lines	if (HAS_WERROR_GLOBAL_CTORS)
if (NOT LLVM_HAS_NOGLOBAL_CTOR_MUTEX)		if (NOT LLVM_HAS_NOGLOBAL_CTOR_MUTEX)
string(REPLACE "-Werror=global-constructors" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})		string(REPLACE "-Werror=global-constructors" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
endif()		endif()
endif()		endif()

if(LLVM_ENABLE_ZLIB)		if(LLVM_ENABLE_ZLIB)
list(APPEND imported_libs ZLIB::ZLIB)		list(APPEND imported_libs ZLIB::ZLIB)
endif()		endif()

set(zstd_target none)

if(LLVM_ENABLE_ZSTD)		if(LLVM_ENABLE_ZSTD)
		phosekUnsubmitted Not Done Reply Inline Actions I'd delete this line altogether. In CMake, you don't need to define variables before you use them and there's no suitable default value here. phosek: I'd delete this line altogether. In CMake, you don't need to define variables before you use…
if(LLVM_PREFER_STATIC_ZSTD)		if(TARGET zstd::libzstd_shared AND NOT LLVM_USE_STATIC_ZSTD)
if(TARGET zstd::libzstd_static)
set(zstd_target zstd::libzstd_static)
else()
set(zstd_target zstd::libzstd_shared)
endif()
else()
if(TARGET zstd::libzstd_shared)
set(zstd_target zstd::libzstd_shared)		set(zstd_target zstd::libzstd_shared)
else()		else()
set(zstd_target zstd::libzstd_static)		set(zstd_target zstd::libzstd_static)
endif()		endif()
endif()		endif()
endif()

if(LLVM_ENABLE_ZSTD)		if(LLVM_ENABLE_ZSTD)
list(APPEND imported_libs ${zstd_target})		list(APPEND imported_libs ${zstd_target})
endif()		endif()

if( MSVC OR MINGW )		if( MSVC OR MINGW )
# libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.		# libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
# advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.		# advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
▲ Show 20 Lines • Show All 306 Lines • Show Last 20 Lines

This is an archive of the discontinued LLVM Phabricator instance.

use LLVM_USE_STATIC_ZSTDClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents

Diff 457697

llvm/CMakeLists.txt

llvm/lib/Support/CMakeLists.txt

use LLVM_USE_STATIC_ZSTD
ClosedPublic