Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

don't use toolchain AR #20

Merged
merged 4 commits into from
Jan 8, 2019
Merged

don't use toolchain AR #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b13463a
don't use toolchain AR
hmaarrfk Jan 7, 2019
d2a158a
build number
hmaarrfk Jan 7, 2019
2a2103a
use which to get the full path of AR
hmaarrfk Jan 7, 2019
9849ec0
Update build.sh
hmaarrfk Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ if [[ ${CMAKE_BUILD} == yes ]]; then

pushd build/cmake

FULL_AR=`which ${AR}`
cmake -G"${CMAKE_GENERATOR}" \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_INSTALL_LIBDIR="lib" \
-DCMAKE_PREFIX_PATH="${PREFIX}" \
-DCMAKE_AR=${FULL_AR} \
"${_CMAKE_EXTRA_CONFIG[@]}"

make -j${CPU_COUNT}
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ source:
- patches/0006-Rename-VS2008-zstdlib-to-libzstd.patch # [win]

build:
number: 1000
number: 1001
run_exports:
# pretty bad removal of symbols in every other micro release:
# https://abi-laboratory.pro/tracker/timeline/zstd/
Expand Down