Skip to content

Commit 01acaf5

Browse files
committed
Test
1 parent 160e587 commit 01acaf5

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

src/Makevars

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
LIBDIR = myrustlib/target/release
22
STATLIB = $(LIBDIR)/libmyrustlib.a
3-
PKG_CFLAGS = -pthread
3+
#PKG_CFLAGS = -pthread
44
PKG_CPPFLAGS = -DSTRICT_R_HEADERS -DR_NO_REMAP
5-
PKG_LIBS = -L$(LIBDIR) -lmyrustlib -pthread
5+
PKG_LIBS = -L$(LIBDIR) -lmyrustlib
66

77
all: cleanup
88

@@ -18,6 +18,8 @@ export CARGO_HOME=$(CARGOTMP)
1818

1919
$(STATLIB):
2020
if [ -f myrustlib/vendor.tar.xz ]; then tar xf myrustlib/vendor.tar.xz && mkdir -p $(CARGOTMP) && cp myrustlib/vendor-config.toml $(CARGOTMP)/config.toml; fi
21+
export CC="$(CC)" && \
22+
export CFLAGS="$(CFLAGS)" && \
2123
PATH="${PATH}:${HOME}/.cargo/bin" cargo build ${CRANFLAGS} --release --manifest-path=myrustlib/Cargo.toml
2224
@rm -Rf $(CARGOTMP) vendor || true # CRAN wants us to remove "detritus"
2325
@rm -Rf $(LIBDIR)/build || true

0 commit comments

Comments
 (0)