Skip to content

Commit

Permalink
Set LIBnn in R/Makefile
Browse files Browse the repository at this point in the history
R tries to detect multilib systems and use `lib64` rather than `lib` in
its installation paths where relevant. We want to avoid this for
building both R stages, since they are installed to ./host and ./wasm
rather than somewhere system-wide, and our webR build scripts assume paths
will use `lib`.

This commit sets `LIBnn` for the R `configure` command so that even on
multilib systems R will be built to use `lib` in its installation paths.
On non-multilib systems it should have no effect.

Fixes #238.
  • Loading branch information
georgestagg committed Jul 25, 2023
1 parent 98fbc2a commit 47a2a5a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions R/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ $(BUILD)/state/R-$(R_VERSION)/r-stage1-configured: $(BUILD)/state/R-$(R_VERSION)
CPPFLAGS="$(STAGE1_CPPFLAGS)" \
CFLAGS="$(STAGE1_CFLAGS)" \
LDFLAGS="$(STAGE1_LDFLAGS)" \
LIBnn="lib" \
../configure \
--prefix="$(R_HOST)" \
--with-x=no \
Expand Down Expand Up @@ -156,6 +157,7 @@ $(BUILD)/state/R-$(R_VERSION)/r-stage2-configured: $(BUILD)/state/R-$(R_VERSION)
CPPFLAGS="$(STAGE2_CPPFLAGS)" \
CFLAGS="$(STAGE2_CFLAGS)" \
LDFLAGS="$(STAGE2_LDFLAGS)" \
LIBnn="lib" \
FFLAGS="" \
FPICFLAGS="-fPIC" \
FC="$(EMFC)" \
Expand Down

0 comments on commit 47a2a5a

Please sign in to comment.