.github: export MACHINE the right way
Otherwise, paths constructed on "build xserver sdk" step aren't valid. Signed-off-by: Mike Gelfand <mikedld@mikedld.com>
This commit is contained in:
parent
f5ea9069e1
commit
53637a8195
|
@ -20,7 +20,8 @@ jobs:
|
||||||
|
|
||||||
- name: prepare build environment
|
- name: prepare build environment
|
||||||
run: |
|
run: |
|
||||||
export MACHINE=`gcc -dumpmachine`
|
MACHINE=`gcc -dumpmachine`
|
||||||
|
echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
|
||||||
echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
|
echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
|
||||||
sudo chown root /bin/tar && sudo chmod u+s /bin/tar
|
sudo chown root /bin/tar && sudo chmod u+s /bin/tar
|
||||||
|
|
||||||
|
@ -78,7 +79,8 @@ jobs:
|
||||||
|
|
||||||
- name: prepare build environment
|
- name: prepare build environment
|
||||||
run: |
|
run: |
|
||||||
export MACHINE=`gcc -dumpmachine`
|
MACHINE=`gcc -dumpmachine`
|
||||||
|
echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
|
||||||
echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
|
echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
|
||||||
sudo chown root /bin/tar && sudo chmod u+s /bin/tar
|
sudo chown root /bin/tar && sudo chmod u+s /bin/tar
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue