Bitmessage/PyBitmessage-2024-12-06
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Update winbuild.sh #1933

Closed
BeholdersEye wants to merge 4 commits from v0.6 into v0.6
pull from: v0.6
merge into: Bitmessage:v0.6
Conversation 18 Commits 4 Files Changed 1 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3310b446b8 - Show all commits

8
buildscripts/winbuild.sh
View File

@ -134,13 +134,13 @@ function build_dll(){
cd src/bitmsghash || exit 1 cd src/bitmsghash || exit 1
if [ "${MACHINE_TYPE}" == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
echo "Create dll" echo "Create dll"
x86_64-w64-mingw32-g++ -D_WIN32 -Wall -O3 -march=x86-64 \ x86_64-w64-mingw32-g++ -D_WIN32 -Wall -O3 -march=native \
"-I$HOME/.wine64/drive_c/OpenSSL-Win64/include" \ "-I$HOME/.wine64/drive_c/OpenSSL-Win64/include" \
g1itch commented 2022-02-22 15:39:32 +01:00 (Migrated from github.com)
Review
Copy Link

why not just remove?

why not just remove?
BeholdersEye commented 2022-02-22 16:51:10 +01:00 (Migrated from github.com)
Review
Copy Link

Is that not what the minus signs indicate?

I sure didn't intend to leave "march=native" so hopefully github is not doing that.

Is that not what the minus signs indicate? I sure didn't intend to leave "march=native" so hopefully github is not doing that.
g1itch commented 2022-02-22 17:12:18 +01:00 (Migrated from github.com)
Review
Copy Link

I mean, aren't those values the defaults, that will be applied if you just remove the -march=native? Though maybe it's better to set that explicitly.

I mean, aren't those values the defaults, that will be applied if you just remove the `-march=native`? Though maybe it's better to set that explicitly.
BeholdersEye commented 2022-02-22 18:08:11 +01:00 (Migrated from github.com)
Review
Copy Link

It turns out that there is no default value for the march option.

There is no default in general, because it's platform-specific.

https://gcc-help.gcc.gnu.narkive.com/Z259fPcD/default-value-for-march-option

Though you can find what your platform will use as default (if it is not specified) with the command:

gcc -Q --help=target

https://stackoverflow.com/questions/27786932/what-is-the-default-for-gcc-march-option

It turns out that there is no default value for the march option. > There is no default in general, because it's platform-specific. https://gcc-help.gcc.gnu.narkive.com/Z259fPcD/default-value-for-march-option Though you can find what your platform will use as default (if it is not specified) with the command: gcc -Q --help=target https://stackoverflow.com/questions/27786932/what-is-the-default-for-gcc-march-option
-I/usr/x86_64-w64-mingw32/include \ -I/usr/x86_64-w64-mingw32/include \
"-L$HOME/.wine64/drive_c/OpenSSL-Win64/lib" \ "-L$HOME/.wine64/drive_c/OpenSSL-Win64/lib" \
-c bitmsghash.cpp -c bitmsghash.cpp
x86_64-w64-mingw32-g++ -static-libgcc -shared bitmsghash.o \ x86_64-w64-mingw32-g++ -static-libgcc -shared bitmsghash.o \
-D_WIN32 -O3 -march=x86-64 \ -D_WIN32 -O3 -march=native \
"-I$HOME/.wine64/drive_c/OpenSSL-Win64/include" \ "-I$HOME/.wine64/drive_c/OpenSSL-Win64/include" \
"-L$HOME/.wine64/drive_c/OpenSSL-Win64" \ "-L$HOME/.wine64/drive_c/OpenSSL-Win64" \
-L/usr/lib/x86_64-linux-gnu/wine \ -L/usr/lib/x86_64-linux-gnu/wine \
@ -148,13 +148,13 @@ function build_dll(){
-o bitmsghash64.dll -Wl,--out-implib,bitmsghash.a -o bitmsghash64.dll -Wl,--out-implib,bitmsghash.a
else else
echo "Create dll" echo "Create dll"
i686-w64-mingw32-g++ -D_WIN32 -Wall -m32 -O3 -march=i686 \ i686-w64-mingw32-g++ -D_WIN32 -Wall -m32 -O3 -march=native \
"-I$HOME/.wine32/drive_c/OpenSSL-Win32/include" \ "-I$HOME/.wine32/drive_c/OpenSSL-Win32/include" \
-I/usr/i686-w64-mingw32/include \ -I/usr/i686-w64-mingw32/include \
"-L$HOME/.wine32/drive_c/OpenSSL-Win32/lib" \ "-L$HOME/.wine32/drive_c/OpenSSL-Win32/lib" \
-c bitmsghash.cpp -c bitmsghash.cpp
i686-w64-mingw32-g++ -static-libgcc -shared bitmsghash.o \ i686-w64-mingw32-g++ -static-libgcc -shared bitmsghash.o \
-D_WIN32 -O3 -march=i686 \ -D_WIN32 -O3 -march=native \
"-I$HOME/.wine32/drive_c/OpenSSL-Win32/include" \ "-I$HOME/.wine32/drive_c/OpenSSL-Win32/include" \
"-L$HOME/.wine32/drive_c/OpenSSL-Win32/lib/MinGW" \ "-L$HOME/.wine32/drive_c/OpenSSL-Win32/lib/MinGW" \
-fPIC -shared -lcrypt32 -leay32 -lwsock32 \ -fPIC -shared -lcrypt32 -leay32 -lwsock32 \