Skip to content

Commit 848cda0

Browse files
committed
---
yaml --- r: 83931 b: refs/heads/dist-snap c: fe4a158 h: refs/heads/master i: 83929: acc51bf 83927: f916453 v: v3
1 parent c4d5d52 commit 848cda0

File tree

7 files changed

+690
-35
lines changed

7 files changed

+690
-35
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 5007fb2d4dc5a7bcdacd55e6e8b14f6973c2490c
9+
refs/heads/dist-snap: fe4a15886c97f6095f99fcc894f050dcf6f974eb
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/mk/platform.mk

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ AR_i686-pc-mingw32=$(AR)
323323
CFG_LIB_NAME_i686-pc-mingw32=$(1).dll
324324
CFG_LIB_GLOB_i686-pc-mingw32=$(1)-*.dll
325325
CFG_LIB_DSYM_GLOB_i686-pc-mingw32=$(1)-*.dylib.dSYM
326-
CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -m32 -march=i686 -D_WIN32_WINNT=0x0600
326+
CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -march=i686
327327
CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti
328-
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g -m32
328+
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g
329329
CFG_GCCISH_DEF_FLAG_i686-pc-mingw32 :=
330330
CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 :=
331331
CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 :=
@@ -367,31 +367,6 @@ CFG_LDPATH_i586-mingw32msvc :=
367367
CFG_RUN_i586-mingw32msvc=
368368
CFG_RUN_TARG_i586-mingw32msvc=
369369

370-
# x86_64-w64-mingw32 configuration
371-
CC_x86_64-w64-mingw32=$(CC)
372-
CXX_x86_64-w64-mingw32=$(CXX)
373-
CPP_x86_64-w64-mingw32=$(CPP)
374-
AR_x86_64-w64-mingw32=$(AR)
375-
CFG_LIB_NAME_x86_64-w64-mingw32=$(1).dll
376-
CFG_LIB_GLOB_x86_64-w64-mingw32=$(1)-*.dll
377-
CFG_LIB_DSYM_GLOB_x86_64-w64-mingw32=$(1)-*.dylib.dSYM
378-
CFG_GCCISH_CFLAGS_x86_64-w64-mingw32 := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600
379-
CFG_GCCISH_CXXFLAGS_x86_64-w64-mingw32 := -fno-rtti
380-
CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -fPIC -g -m64
381-
CFG_GCCISH_DEF_FLAG_x86_64-w64-mingw32 :=
382-
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-w64-mingw32 :=
383-
CFG_GCCISH_POST_LIB_FLAGS_x86_64-w64-mingw32 :=
384-
CFG_DEF_SUFFIX_x86_64-w64-mingw32 := .mingw32.def
385-
CFG_INSTALL_NAME_x86_64-w64-mingw32 =
386-
CFG_LIBUV_LINK_FLAGS_x86_64-w64-mingw32 := -lWs2_32 -lpsapi -liphlpapi
387-
CFG_EXE_SUFFIX_x86_64-w64-mingw32 := .exe
388-
CFG_WINDOWSY_x86_64-w64-mingw32 := 1
389-
CFG_UNIXY_x86_64-w64-mingw32 :=
390-
CFG_PATH_MUNGE_x86_64-w64-mingw32 :=
391-
CFG_LDPATH_x86_64-w64-mingw32 :=$(CFG_LDPATH_x86_64-w64-mingw32):$(PATH)
392-
CFG_RUN_x86_64-w64-mingw32=PATH="$(CFG_LDPATH_x86_64-w64-mingw32):$(1)" $(2)
393-
CFG_RUN_TARG_x86_64-w64-mingw32=$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD_TRIPLE)),$(2))
394-
395370
# x86_64-unknown-freebsd configuration
396371
CC_x86_64-unknown-freebsd=$(CC)
397372
CXX_x86_64-unknown-freebsd=$(CXX)

0 commit comments

Comments
 (0)