Skip to content

Commit

Permalink
Move duckdb.tar dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Jan 20, 2025
1 parent 8f09533 commit d8d4943
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#
# The symbols.rds file helps troubleshoot issues with forbidden symbols
# such as abort. Omitted to speed up compilation during development.
# all: duckdb.tar symbols.rds $(SHLIB)
all: duckdb.tar $(SHLIB)
# all: symbols.rds $(SHLIB)
all: $(SHLIB)

include include/sources.mk

Expand Down
4 changes: 2 additions & 2 deletions src/Makevars.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#
# The symbols.rds file helps troubleshoot issues with forbidden symbols
# such as abort. Omitted to speed up compilation during development.
# all: duckdb.tar symbols.rds $(SHLIB)
all: duckdb.tar $(SHLIB)
# all: symbols.rds $(SHLIB)
all: $(SHLIB)

include include/sources.mk

Expand Down
4 changes: 2 additions & 2 deletions src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#
# The symbols.rds file helps troubleshoot issues with forbidden symbols
# such as abort. Omitted to speed up compilation during development.
# all: duckdb.tar symbols.rds $(SHLIB)
all: duckdb.tar $(SHLIB)
# all: symbols.rds $(SHLIB)
all: $(SHLIB)

include include/sources.mk

Expand Down
1 change: 1 addition & 0 deletions src/include/from-tar.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# to an existing file.
# We print details on the object files already extracted in the configure script
# for diagnostic purposes.
all: duckdb.tar
duckdb.tar: $(DUCKDB_R_PREBUILT_ARCHIVE)
ls -lR
# Ensure the file is recreated in the next run
Expand Down
1 change: 1 addition & 0 deletions src/include/to-tar-win.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file is used from Makevars if $DUCKDB_R_PREBUILT_ARCHIVE is empty
# or does not point to an existing file.
# In the latter case, we create the file after the object files have been built.
all: duckdb.tar
duckdb.tar: $(SOURCES)
if [ -n "$(DUCKDB_R_PREBUILT_ARCHIVE)" ]; then tar -cv --force-local -f "$(DUCKDB_R_PREBUILT_ARCHIVE)" $(SOURCES); fi
rm -f Makevars.duckdb
1 change: 1 addition & 0 deletions src/include/to-tar.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file is used from Makevars if $DUCKDB_R_PREBUILT_ARCHIVE is empty
# or does not point to an existing file.
# In the latter case, we create the file after the object files have been built.
all: duckdb.tar
duckdb.tar: $(SOURCES)
if [ -n "$(DUCKDB_R_PREBUILT_ARCHIVE)" ]; then tar -cv -f "$(DUCKDB_R_PREBUILT_ARCHIVE)" $(SOURCES); fi
rm -f Makevars.duckdb

0 comments on commit d8d4943

Please sign in to comment.