Fix --with-rpath and add CI tests (#18668) ##build

This commit is contained in:
pancake 2021-05-09 19:57:11 +02:00 committed by GitHub
parent b8f1edfa37
commit efeba1d15b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 2 deletions

View File

@ -24,6 +24,41 @@ jobs:
run: sudo make uninstall
- name: Reinstalling without symlinks
run: sudo make install
build-rpath-linux:
if: contains(github.ref, 'master') || contains(github.ref, 'ci-')
name: linux-rpath
continue-on-error: true
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
- name: build and run
run: |
# test and build rpath installation
export CFLAGS=-O0
./configure --prefix=/tmp --with-rpath
make -j
make install
ldd /tmp/bin/r2
/tmp/bin/r2 -v
/tmp/bin/rabin2 -l /tmp/bin/r2
build-rpath-macos:
if: contains(github.ref, 'master') || contains(github.ref, 'ci-')
name: macos-rpath
continue-on-error: true
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: build and run
run: |
# test and build rpath installation
export CFLAGS=-O0
./configure --prefix=/tmp --with-rpath
make -j
make install
/tmp/bin/r2 -v
/tmp/bin/rabin2 -l /tmp/bin/r2
build-spaces:
name: linux-meson-spaces
continue-on-error: true

View File

@ -34,7 +34,7 @@ EXT_EXE=.bc
endif
ifeq ($(USE_RPATH),1)
LDFLAGS+=-Wl,-rpath "${LIBDIR}"
LDFLAGS+=-Wl,-rpath,"${LIBDIR}"
endif
OBJ+=${BIN}.o

View File

@ -19,6 +19,10 @@ HAVE_FORK=@HAVE_FORK@
WANT_DYLINK=@WANT_DYLINK@
WITH_LIBR=@WITH_LIBR@
ifeq ($(USE_RPATH),1)
LDFLAGS_LIB+=-Wl,-rpath,"${LIBDIR}"
endif
MKPLUGINS=mk/stat.mk mk/sloc.mk
COMPILER=@USERCC@

View File

@ -34,7 +34,7 @@ SRC=$(subst .o,.c,$(OBJ))
BEXE=$(BIN)$(EXT_EXE)
ifeq ($(USE_RPATH),1)
LINK+=-Wl,-rpath "${LIBDIR}"
LINK+=-Wl,-rpath,"${LIBDIR}"
endif
ifeq (${OSTYPE},gnulinux)