Skip to content

Fix shermes Windows CC path splitting (#1994) #2089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tangtaizong666 wants to merge 2 commits into
base: static_h
Choose a base branch
from
+44 −5
Open

Fix shermes Windows CC path splitting (#1994) #2089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f480e9
Fix shermes Windows CC path splitting
tangtaizong666 Jun 25, 2026
79a4ab3
Address shermes path separator review
tangtaizong666 Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions test/shermes/windows-cc-path-separator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

// REQUIRES: windows
// RUN: (%shermes -v -Wc,--shermes-invalid-cc-option -o %t.exe %s || true) 2>&1 | %FileCheck %s

// CHECK: --shermes-invalid-cc-option
// CHECK-NOT: {{(^| )-I[A-Za-z]( |$)}}
// CHECK-NOT: {{(^| )-L[A-Za-z]( |$)}}
// CHECK-NOT: {{(^| )-Wl,-rpath [A-Za-z]( |$)}}
// CHECK-NOT: {{[A-Za-z]:[^ ]*:[A-Za-z]:}}
// CHECK: {{(^| )-o }}

print("ok");
25 changes: 22 additions & 3 deletions tools/shermes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,29 @@ set(HERMES_ENABLE_EH OFF)
set(SHERMES_CC "${CMAKE_C_COMPILER}" CACHE STRING "C compiler to invoke")
set(SHERMES_CC_SYSCFLAGS "" CACHE STRING "C compiler system flags")
set(SHERMES_CC_SYSLDFLAGS "" CACHE STRING "C compiler system linker flags")
set(SHERMES_CC_INCLUDE_PATH
"${PROJECT_BINARY_DIR}/lib/config:${PROJECT_SOURCE_DIR}/include" CACHE STRING
if(CMAKE_HOST_WIN32)
set(SHERMES_CC_PATH_SEPARATOR ";")
else()
set(SHERMES_CC_PATH_SEPARATOR ":")
endif()

set(SHERMES_CC_INCLUDE_PATH_DEFAULT_ENTRIES
"${PROJECT_BINARY_DIR}/lib/config"
"${PROJECT_SOURCE_DIR}/include")
list(JOIN SHERMES_CC_INCLUDE_PATH_DEFAULT_ENTRIES
"${SHERMES_CC_PATH_SEPARATOR}"
SHERMES_CC_INCLUDE_PATH_DEFAULT)

set(SHERMES_CC_LIB_PATH_DEFAULT_ENTRIES
"$<TARGET_FILE_DIR:hermesvm>"
"$<TARGET_FILE_DIR:jsi>"
"$<TARGET_FILE_DIR:shermes_console>")
list(JOIN SHERMES_CC_LIB_PATH_DEFAULT_ENTRIES
"${SHERMES_CC_PATH_SEPARATOR}"
SHERMES_CC_LIB_PATH_DEFAULT)
set(SHERMES_CC_INCLUDE_PATH "${SHERMES_CC_INCLUDE_PATH_DEFAULT}" CACHE STRING
"Include path when invoking CC")
set(SHERMES_CC_LIB_PATH "$<TARGET_FILE_DIR:hermesvm>:$<TARGET_FILE_DIR:jsi>:$<TARGET_FILE_DIR:shermes_console>" CACHE STRING
set(SHERMES_CC_LIB_PATH "${SHERMES_CC_LIB_PATH_DEFAULT}" CACHE STRING
"Library path when invoking CC")

if (HERMES_ENABLE_ADDRESS_SANITIZER)
Expand Down
6 changes: 4 additions & 2 deletions tools/shermes/compile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,14 @@ void populateCCCfg(CCCfg &cfg) {
init(cfg.ldlibs, "LDLIBS", "");

llvh::SmallVector<llvh::StringRef, 2> vec{};
llvh::StringLiteral(SHERMES_CC_LIB_PATH).split(vec, ':', -1, false);
llvh::StringLiteral(SHERMES_CC_LIB_PATH)
.split(vec, llvh::sys::EnvPathSeparator, -1, false);
for (auto sr : vec)
cfg.hermesLibPath.push_back(sr.str());

vec.clear();
llvh::StringLiteral(SHERMES_CC_INCLUDE_PATH).split(vec, ':', -1, false);
llvh::StringLiteral(SHERMES_CC_INCLUDE_PATH)
.split(vec, llvh::sys::EnvPathSeparator, -1, false);
for (auto sr : vec)
cfg.hermesIncludePath.push_back(sr.str());
}
Expand Down