Skip to content

Commit de1dd22

Browse files
committed
Correct configure
1 parent eb56730 commit de1dd22

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

configure

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ fi
3030
## At CRAN or R-universe we encounter nothing else.
3131
## Use Sys.info() to be cross-compilation safe.
3232
: ${R_HOME=$(R RHOME)}
33-
sysname=$(${R_HOME}/bin/Rscript -e 'cat(Sys.info()[["sysname"]])')
34-
arch=$(${R_HOME}/bin/Rscript -e 'cat(Sys.info()[["machine"]])')
33+
sysname=$(uname)
34+
arch=$(uname -m)
3535
osname=$(${R_HOME}/bin/Rscript -e 'cat(R.version$os)')
36-
if [ ${sysname} = "Linux" ] & [ ${osname} != "linux-musl" ]; then
36+
if [ ${sysname} = "Linux" ] && [ ${osname} != "linux-musl" ]; then
3737
platform="linux"
3838
elif [ ${sysname} = "Darwin" ]; then
3939
platform="osx"
@@ -45,7 +45,6 @@ else
4545
cp -ax src/Makevars.no_blp src/Makevars
4646
exit 0
4747
fi
48-
echo "Seeing ${sysname} ${arch} ${osname} ${platform}"
4948

5049
## Populate Makevars
5150
if [ "${arch}" = "x86_64" ] && [ "${platform}" = "linux" ]; then

0 commit comments

Comments
 (0)