This is an archive of the discontinued LLVM Phabricator instance.

Differential D139765

[NFC] [DirectX backend] copy dxil-dis as exe file on windows
ClosedPublic

Authored by python3kgae on Dec 9 2022, 8:35 PM.

Details

Reviewers
beanz
bob80905
bogner
pow2clk
Commits
rG4eaccea4f154: [NFC] [DirectX backend] copy dxil-dis as exe file on windows
Summary

Without .exe in the name on windows, the test not work.

Diff Detail

Unit TestsFailed

TimeTest
60,100 msx64 debian > AddressSanitizer-x86_64-linux.TestCases/Posix::stack-use-after-return.cpp

Event Timeline

python3kgae created this revision.Dec 9 2022, 8:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 9 2022, 8:35 PM
python3kgae requested review of this revision.Dec 9 2022, 8:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 9 2022, 8:35 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
beanz added inline comments.Dec 9 2022, 8:50 PM
llvm/tools/dxil-dis/CMakeLists.txt
20

You should be able to use CMAKE_EXECUTABLE_SUFFIX here instead: https://cmake.org/cmake/help/latest/variable/CMAKE_EXECUTABLE_SUFFIX.html

python3kgae updated this revision to Diff 481825.Dec 9 2022, 8:56 PM

Use CMAKE_EXECUTABLE_SUFFIX

Harbormaster completed remote builds in B202364: Diff 481825.Dec 9 2022, 10:20 PM
beanz accepted this revision.Dec 13 2022, 3:21 PM

LGTM

This revision is now accepted and ready to land.Dec 13 2022, 3:21 PM
This revision was landed with ongoing or failed builds.Dec 13 2022, 4:35 PM
Closed by commit rG4eaccea4f154: [NFC] [DirectX backend] copy dxil-dis as exe file on windows (authored by python3kgae). · Explain Why
This revision was automatically updated to reflect the committed changes.
python3kgae added a commit: rG4eaccea4f154: [NFC] [DirectX backend] copy dxil-dis as exe file on windows.

Revision Contents

PathSize
llvm/
tools/
dxil-dis/
2 lines

Diff 481825

llvm/tools/dxil-dis/CMakeLists.txt

Show All 11 Lines
if (CMAKE_HOST_UNIX) if (CMAKE_HOST_UNIX)
set(LLVM_LINK_OR_COPY create_symlink) set(LLVM_LINK_OR_COPY create_symlink)
else () else ()
set(LLVM_LINK_OR_COPY copy) set(LLVM_LINK_OR_COPY copy)
endif () endif ()
if (DXIL_DIS) if (DXIL_DIS)
add_custom_target(dxil-dis add_custom_target(dxil-dis
COMMAND ${CMAKE_COMMAND} -E ${LLVM_LINK_OR_COPY} "${DXIL_DIS}" "${LLVM_RUNTIME_OUTPUT_INTDIR}/dxil-dis") COMMAND ${CMAKE_COMMAND} -E ${LLVM_LINK_OR_COPY} "${DXIL_DIS}" "${LLVM_RUNTIME_OUTPUT_INTDIR}/dxil-dis${CMAKE_EXECUTABLE_SUFFIX}")
beanzUnsubmitted
Not Done
ReplyInline Actions
add_custom_target(dxil-dis
- COMMAND ${CMAKE_COMMAND} -E ${LLVM_LINK_OR_COPY} "${DXIL_DIS}" "${LLVM_RUNTIME_OUTPUT_INTDIR}/${DXIL_DIS_NAME}")
+ COMMAND ${CMAKE_COMMAND} -E ${LLVM_LINK_OR_COPY} "${DXIL_DIS}" "${LLVM_RUNTIME_OUTPUT_INTDIR}/dxil-dis${CMAKE_EXECUTABLE_SUFFIX}")
return()

You should be able to use CMAKE_EXECUTABLE_SUFFIX here instead: https://cmake.org/cmake/help/latest/variable/CMAKE_EXECUTABLE_SUFFIX.html

beanz: You should be able to use CMAKE_EXECUTABLE_SUFFIX here instead: https://cmake.
return() return()
endif () endif ()
include(ExternalProject) include(ExternalProject)
set(SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/DXC-src) set(SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/DXC-src)
set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/DXC-bins) set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/DXC-bins)
set(GIT_SETTINGS GIT_REPOSITORY https://github.com/microsoft/DirectXShaderCompiler.git) set(GIT_SETTINGS GIT_REPOSITORY https://github.com/microsoft/DirectXShaderCompiler.git)
Show All 20 Lines