Skip to content

Commit 1bda6a9

Browse files
committed
Make HPHP_VIXL a public compile definition
D94756745 came with a new listfile for the vixl update (thanks for that!). Update it to make `HPHP_VIXL` a public compile definition so that targets that consume `vixl` have it defined when including vixl headers, otherwise HHVM-specific compatibility methods will be missing.
1 parent 381c03b commit 1bda6a9

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

hphp/vixl/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ set(HEADER_SOURCES)
44
auto_sources(files "*.cc" "${CMAKE_CURRENT_SOURCE_DIR}")
55
list(APPEND CXX_SOURCES ${files})
66

7-
if(NOT IS_AARCH64)
8-
add_definitions("-DHPHP_VIXL")
9-
endif()
10-
117
auto_sources(files "*.cc" "${CMAKE_CURRENT_SOURCE_DIR}/aarch64")
128
# Exclude simulator-related .cc files
139
list(FILTER files EXCLUDE REGEX "simulator-aarch64\\.cc$")
@@ -25,7 +21,8 @@ HHVM_PUBLIC_HEADERS(vixl ${files})
2521

2622
add_library(vixl STATIC ${CXX_SOURCES} ${HEADER_SOURCES})
2723
target_compile_definitions(vixl PRIVATE
28-
HPHP_VIXL VIXL_INCLUDE_TARGET_AARCH64 VIXL_CODE_BUFFER_MALLOC)
24+
VIXL_INCLUDE_TARGET_AARCH64 VIXL_CODE_BUFFER_MALLOC)
25+
target_compile_definitions(vixl PUBLIC HPHP_VIXL)
2926
target_link_libraries(vixl hphp_util)
3027
auto_source_group("vixl" "${CMAKE_CURRENT_SOURCE_DIR}"
3128
${CXX_SOURCES} ${HEADER_SOURCES})

0 commit comments

Comments
 (0)