Skip to content

Commit 3480a47

Browse files
committed
Try other LDFALGS
1 parent 922aa6a commit 3480a47

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

GitHubActions/build_sqlite_fdw.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mkdir -p ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw
2121
tar zxf ./sqlite_fdw.tar.gz -C ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw/
2222
cd ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw
2323

24-
vars='CI_ENV=1'
24+
vars='CI_ENV=1 LD_LIBRARY_PATH=/usr/local/lib:/usr/lib'
2525

2626
if [ "$MODE" == "postgis" ]; then
2727
make $vars ENABLE_GIS=1

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ else
3838
DLSUFFIX = .so
3939
endif
4040

41-
ifndef CI_ENV
42-
LD_LIBRARY_PATH := /usr/local/lib:/usr/lib
41+
ifdef CI_ENV
42+
override LDFLAGS += -L/usr/local/lib
4343
endif
4444

4545
SHLIB_LINK := -lsqlite3
@@ -82,7 +82,9 @@ $(info DLSUFFIX is $(DLSUFFIX))
8282
$(info CI_ENV is $(CI_ENV))
8383
$(info ENABLE_GIS is $(ENABLE_GIS))
8484

85+
ifdef ENABLE_GIS
8586
check: temp-install
8687
temp-install: EXTRA_INSTALL+=contrib/postgis
8788
checkprep: EXTRA_INSTALL+=contrib/postgis
8889
endif
90+

0 commit comments

Comments
 (0)