Skip to content

Add OS detection #717

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
julcap wants to merge 5 commits into
base: master
Choose a base branch
from
+10 −1
Open

Add OS detection #717

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b13b493
Add a way to detect OS in shell script
julcap Aug 7, 2022
15b4444
Add a way to detect OS in shell for both Linux and Mac
julcap Aug 7, 2022
91292c7
Merge remote-tracking branch 'origin/master'
julcap Aug 7, 2022
9fc1147
Add a way to detect OS in shell for both Linux and Mac
julcap Aug 7, 2022
6b26528
Merge remote-tracking branch 'origin/master'
julcap Aug 7, 2022
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
11 changes: 10 additions & 1 deletion contrib/build_qt/qt/env.source
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,16 @@ else
BIN_DIR="${BIN_DIR:-$ENV_ROOT/bin}"

export LDFLAGS="-L${TARGET_DIR}/lib"
# FIXME: detect OS somehow

if [[ $(uname) == "Darwin" ]];then
export OS="$(sw_vers -productName) $(sw_vers -productVersion) $(sw_vers -buildVersion)"
export OS_ARCHITECTURE=$(uname -m)
export OS_TYPE=$(uname)
else
export OS=$(cat /etc/issue)
export OS_ARCHITECTURE=$(uname -m)
export OS_TYPE=$(uname -o)
fi
export DYLD_LIBRARY_PATH="${TARGET_DIR}/lib"
export PKG_CONFIG_PATH="$TARGET_DIR/lib/pkgconfig"
#export CFLAGS="-I${TARGET_DIR}/include $LDFLAGS -static-libgcc -Wl,-Bstatic -lc"
Expand Down