Skip to content

Commit

Permalink
fixup visibility and .a reproducibility
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Jan 15, 2024
1 parent 5cb8342 commit aa53fae
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions libpsl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# Issues:
# - does not support CMake (only autotools and meson). Where autotools is broken
# in curl-for-win.
# - could not make symbol-hiding work with autotools.
# - autotools build force-sets _WIN32_WINNT to 0x500, while also causing
# a compiler warning when overriding our value (which is a higher version).
# Builds are not supposed to set _WIN32_WINNT on their own, esp. not override
Expand All @@ -31,12 +32,12 @@ _VER="$1"
(
cd "${_BLDDIR}"
python3 '../src/psl-make-dafsa' --output-format=cxx+ '../list/public_suffix_list.dat' 'suffixes_dafsa.h'
# shellcheck disable=SC2086
# shellcheck disable=SC2046,SC2086
${_CC_GLOBAL} ${_CFLAGS_GLOBAL} ${_CFLAGS_GLOBAL_AUTOTOOLS} ${_CPPFLAGS_GLOBAL} \
-DENABLE_BUILTIN -DHAVE_VISIBILITY=1 -DBUILDING_PSL \
-DPACKAGE_VERSION="\"${LIBPSL_VER_}\"" \
-I. -I../include -c ../src/*.c
"${AR}" rcs libpsl.a ./*.o
-DENABLE_BUILTIN -DPACKAGE_VERSION="\"${LIBPSL_VER_}\"" \
-I. -I../include -c $(find ../src -name '*.c' | sort)
# shellcheck disable=SC2046
"${AR}" rcs libpsl.a $(find . -name '*.o' | sort)
)

# Install manually
Expand Down

0 comments on commit aa53fae

Please sign in to comment.