Skip to content

Commit e0a3bd0

Browse files
committed
Revert "Fix rpath issues"
This reverts commit 9b1fbf9.
1 parent 5028c4b commit e0a3bd0

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,22 @@ JWTCFLAGS=$(shell pkg-config --cflags libjwt)
66
SSLLDFLAGS=-lssl -lcrypto
77
SSLCFLAGS=
88
CFLAGS=-D_GNU_SOURCE $(JWTCFLAGS) $(SSLCFLAGS) -pedantic -Wall -Wno-unused-result -fpic -c
9-
LDFLAGS=$(JWTLDFLAGS) $(SSLLDFLAGS) -shared -Wl,-rpath='$$ORIGIN'
9+
LDFLAGS=$(JWTLDFLAGS) $(SSLLDFLAGS) -shared
1010

1111
LIBEXT=$(shell swipl -q -g 'current_prolog_flag(shared_object_extension, Ext), writeln(Ext)' -t halt)
1212
LIBNAME=jwt_io
13-
TARGET=lib/x86_64-linux/$(LIBNAME).$(LIBEXT)
1413

1514
testfiles := $(wildcard tests/*.plt)
1615

17-
all: $(TARGET)
16+
all: $(LIBNAME).$(LIBEXT)
1817

19-
$(TARGET): src/$(LIBNAME).o
20-
gcc $(LDFLAGS) -o $@ $<
18+
$(LIBNAME).$(LIBEXT): src/$(LIBNAME).o
19+
swipl-ld $(LDFLAGS) -o $@ $<
2120

2221
%.o: %.c
2322
swipl-ld $(CFLAGS) $<
2423

25-
check: $(TARGET)$(testfiles)
24+
check: $(LIBNAME).$(LIBEXT) $(testfiles)
2625

2726
%.plt: FORCE
2827
swipl -s $@ -g run_tests -t halt

prolog/jwt_io.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
@license BSD
6868
*/
6969

70-
:- use_foreign_library(foreign(jwt_io)).
70+
:- use_foreign_library(jwt_io).
7171

7272
:- use_module(library(http/json)).
7373
:- use_module(library(settings)).

0 commit comments

Comments
 (0)