Skip to content

Commit

Permalink
Fix linux build (#1473)
Browse files Browse the repository at this point in the history
Summary: Pull Request resolved: #1473

Differential Revision: D61224976
  • Loading branch information
Matt Blagden authored and facebook-github-bot committed Aug 14, 2024
1 parent 880b164 commit 6ecdc2d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
name: android-hermes
path: output
linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Install dependencies
run: |-
Expand All @@ -54,13 +54,8 @@ jobs:
path: hermes
- name: Build linux CLI
run: |-
cmake -S hermes -B build_hdb -DHERMES_STATIC_LINK=ON -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS=-s -DCMAKE_C_FLAGS=-s \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
cmake -S hermes -B build -DHERMES_STATIC_LINK=ON -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS=-s -DCMAKE_C_FLAGS=-s \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive" \
-DHERMES_ENABLE_DEBUGGER=False
cmake -S hermes -B build_hdb
cmake -S hermes -B build
cmake --build build_hdb --target hdb
cmake --build build --target check-hermes hermes hvm hbcdump hermesc
- name: Create CLI tarball
Expand Down
2 changes: 1 addition & 1 deletion external/llvh/utils/lit/lit/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ def main_with_tmp(builtinParameters):
parser.error('No inputs specified')

if opts.numThreads is None:
opts.numThreads = lit.util.detectCPUs()
opts.numThreads = 1
elif opts.numThreads <= 0:
parser.error("Option '--threads' or '-j' requires positive integer")

Expand Down

0 comments on commit 6ecdc2d

Please sign in to comment.