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.

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

Make dynamic MinGW build copy DLLs instead of trying to manipulate PATH #3787

Merged
merged 3 commits into from
Mar 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 11 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,17 @@ matrix:
before_script:
- ./configure --install-deps --source-deps-only --disable-lz4-ext --prefix="$PWD/dest" --enable-static --enable-strip

# - name: "Windows MinGW-w64 Dynamic"
# # Disable for now because msys2 libstdc++ is not compiled with gcc 11,
# # while gcc 11 is used for building librdkafka, and gcc 11 brings in
# # a new _ZSt28__throw_bad_array_new_lengthv symbol that won't be found
# # when trying to run the resulting binary since it using the older libstdc++.
# if: tag IS PRESENT
# os: windows
# env:
# - LINKAGE=std
# - SKIP_MAKE=y
# before_install:
# - source ./packaging/mingw-w64/travis-before-install.sh
# before_script:
# - ./packaging/mingw-w64/configure-build-msys2-mingw.sh
#
- name: "Windows MinGW-w64 Dynamic"
if: tag IS PRESENT
os: windows
env:
- LINKAGE=std
- SKIP_MAKE=y
before_install:
- source ./packaging/mingw-w64/travis-before-install.sh
before_script:
- ./packaging/mingw-w64/configure-build-msys2-mingw.sh

- name: "Windows MinGW-w64 Static"
os: windows
env:
Expand Down
3 changes: 2 additions & 1 deletion packaging/mingw-w64/configure-build-msys2-mingw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ cmake \
$mingw64 mingw32-make
$mingw64 mingw32-make install

export PATH="$PWD/dest/bin:/mingw64/bin/:${PATH}"
cd tests
cp ../dest/bin/librdkafka.dll ./
cp ../dest/bin/librdkafka++.dll ./
./test-runner.exe -l -Q -p1 0000