Skip to content

Commit

Permalink
Remove hts_probe_cc.sh and don't try to run it from Makefile
Browse files Browse the repository at this point in the history
Pysam always runs configure, so we don't need or want this.
It was being run by `make distclean` on an otherwise clean directory
(and failing from an sdist, which didn't include hts_probe_cc.sh),
so use `-include` to avoid trying to rebuild it in this case.
Hat tip @nsoranzo.
  • Loading branch information
jmarshall committed Apr 23, 2024
1 parent b163e9e commit 8ab5287
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 151 deletions.
9 changes: 1 addition & 8 deletions htslib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,6 @@ all: lib-static lib-shared $(BUILT_PROGRAMS) plugins $(BUILT_TEST_PROGRAMS) \

ALL_CPPFLAGS = -I. $(CPPFLAGS)

# Usually htscodecs.mk is generated by running configure or config.status,
# but if those aren't used create a default here.
htscodecs.mk:
echo '# Default htscodecs.mk generated by Makefile' > $@
echo 'include $$(HTSPREFIX)htscodecs_bundled.mk' >> $@
$(srcdir)/hts_probe_cc.sh '$(CC)' '$(CFLAGS) $(CPPFLAGS)' '$(LDFLAGS)' >> $@

srcdir = .
srcprefix =
HTSPREFIX =
Expand All @@ -139,7 +132,7 @@ HTS_BUILD_POPCNT =
HTS_BUILD_SSE4_1 =

include htslib_vars.mk
include htscodecs.mk
-include htscodecs.mk

# If not using GNU make, you need to copy the version number from version.sh
# into here.
Expand Down
143 changes: 0 additions & 143 deletions htslib/hts_probe_cc.sh

This file was deleted.

0 comments on commit 8ab5287

Please sign in to comment.