Skip to content

Commit 2e9ebdf

Browse files
committed
Keep generating rpath on Haiku as requested by @SeanTAllen
ponylang#5358 (comment)
1 parent a002480 commit 2e9ebdf

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

cmake/RunFullPrograms.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ endif()
2828
# where it already exists.
2929
file(MAKE_DIRECTORY "${OUTPUT}")
3030

31-
# On Haiku create symlink lib -> test_lib in target directory,
32-
# to use system's default path to find custom libraries needed to run executables.
33-
if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Haiku")
34-
file(CREATE_LINK "${TEST_LIB}" "${OUTPUT}/lib" SYMBOLIC)
35-
endif()
36-
3731
set(_run "${RUNNER}"
3832
"--debugger=$ENV{PONY_TEST_DEBUGGER}"
3933
"--timeout_s=${_timeout}"

src/libponyc/codegen/genexe.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,12 +1521,7 @@ static bool link_exe_lld_elf(compile_t* c, ast_t* program,
15211521
snprintf(buf, sizeof(buf), "-L%s", path);
15221522
args.push_back(stringtab(c->opt->strtab, buf));
15231523

1524-
// On Haiku installations go to one of standard paths, so there's no need
1525-
// to support non-standard installations. It also would end up with incorrect
1526-
// RUNPATHs specified in pony-[lsp|doc|lint] executables because
1527-
// `cmake --install` does not update RUNPATHS for target environment
1528-
// and paths stay as they are for build environment.
1529-
if(!c->opt->staticbin && !is_haiku)
1524+
if(!c->opt->staticbin)
15301525
{
15311526
args.push_back("-rpath");
15321527
args.push_back(path);

0 commit comments

Comments
 (0)