Skip to content

Commit 10727dd

Browse files
committed
GHA: Fix / debug Linux build
1 parent 4316a6b commit 10727dd

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

.github/workflows/build-linux.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
sudo debootstrap --arch=$(dpkg --print-architecture) focal sysroot-focal http://archive.ubuntu.com/ubuntu
113113
fi
114114
sudo chroot sysroot-focal apt-get update
115-
sudo chroot sysroot-focal apt-get install -y build-essential git wget curl sudo unzip zip autoconf libfreetype6-dev libcups2-dev libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev libasound2-dev libffi-dev file binutils libfontconfig-dev
115+
sudo chroot sysroot-focal apt-get install -y build-essential git wget curl sudo unzip zip autoconf libfreetype6-dev libcups2-dev libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev libasound2-dev libffi-dev file binutils libfontconfig-dev libc6-dev libpthread-stubs0-dev
116116
# If we really need gcc-10, we can get it from this PPA:
117117
sudo chroot sysroot-focal apt-get install -y software-properties-common
118118
sudo chroot sysroot-focal sudo add-apt-repository ppa:ubuntu-toolchain-r/test
@@ -121,6 +121,10 @@ jobs:
121121
echo $PWD
122122
ls -F
123123
124+
- name: 'Check pthread in sysroot'
125+
run: |
126+
find sysroot-focal -name 'libpthread.[sa]*' -ls
127+
124128
- name: 'Get the BootJDK'
125129
id: bootjdk
126130
uses: ./.github/actions/get-bootjdk
@@ -174,13 +178,17 @@ jobs:
174178
--with-sysroot=${{ env.SYSROOT_PATH }}
175179
--with-extra-cflags=--sysroot=${{ env.SYSROOT_PATH }}
176180
--with-extra-cxxflags=--sysroot=${{ env.SYSROOT_PATH }}
177-
--with-extra-ldflags=--sysroot=${{ env.SYSROOT_PATH }}
181+
--with-extra-ldflags="--sysroot=${{ env.SYSROOT_PATH }} -L$PWD/sysroot-focal/lib/x86_64-linux-gnu -Wl,-rpath-link,$PWD/sysroot-focal/lib/x86_64-linux-gnu"
178182
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
179183
echo "Dumping config.log:" &&
180184
cat config.log &&
181185
echo PWD=$PWD &&
182186
exit 1)
183187
188+
- name: 'Check build config'
189+
run: |
190+
grep -E 'LDFLAGS|LIBS' build/*/spec.gmk build/*/bnuildjdk-spec.gmk || true
191+
184192
- name: 'Build'
185193
id: build
186194
uses: ./.github/actions/do-build

0 commit comments

Comments
 (0)