Skip to content

Commit 50e61e0

Browse files
committed
build and install stuff
1 parent cacdc92 commit 50e61e0

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ test:
4242
check:
4343
_R_CHECK_CRAN_INCOMING_REMOTE_=false $(R) CMD check data.table_1.12.9.tar.gz --as-cran --ignore-vignettes --no-stop-on-test-error
4444

45+
.PHONY: revision
46+
revision:
47+
echo "Revision: $(shell git rev-parse HEAD)" >> DESCRIPTION

configure

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
#!/bin/sh
2+
3+
# Find R compilers
4+
CC=`${R_HOME}/bin/R CMD config CC`
5+
CFLAGS=`${R_HOME}/bin/R CMD config CFLAGS`
6+
# compiler and flags to 'compilation' file
7+
echo "CC=${CC}" > inst/compilation
8+
echo "CFLAGS=${CFLAGS}" >> inst/compilation
9+
10+
# compiler info to output #3291
11+
if [ "$CC"=~"gcc" ]; then
12+
GCCV=`${CC} -dumpfullversion -dumpversion`
13+
echo "$CC $GCCV"
14+
fi
15+
216
# Let's keep this simple. If pkg-config is available, use it. Otherwise print
317
# the helpful message to aid user if compilation does fail. Note 25 of R-exts:
418
# "[pkg-config] is available on the machines used to produce the CRAN binary packages"
@@ -51,10 +65,6 @@ fi
5165
version=`pkg-config --modversion zlib`
5266
echo "zlib ${version} is available ok"
5367

54-
# Find R compilers
55-
CC=`${R_HOME}/bin/R CMD config CC`
56-
CFLAGS=`${R_HOME}/bin/R CMD config CFLAGS`
57-
5868
# Test if we have a OPENMP compatible compiler
5969
# Aside: ${SHLIB_OPENMP_CFLAGS} does not appear to be defined at this point according to Matt's testing on
6070
# Linux, and R CMD config SHLIB_OPENMP_CFLAGS also returns 'no information for variable'. That's not
@@ -77,10 +87,4 @@ else
7787
sed -e "s|@openmp_cflags@|\$(SHLIB_OPENMP_CFLAGS)|" src/Makevars.in > src/Makevars
7888
fi
7989

80-
# compiler info to output #3291
81-
if [ "$CC"=~"gcc" ]; then
82-
GCCV=`${CC} -dumpfullversion -dumpversion`
83-
echo "$CC $GCCV"
84-
fi
85-
8690
exit 0

0 commit comments

Comments
 (0)