Skip to content

Commit 418a083

Browse files
brsonyichoi
authored andcommitted
---
yaml --- r: 48124 b: refs/heads/incoming c: dae97b4 h: refs/heads/master v: v3
1 parent 3e12845 commit 418a083

File tree

2 files changed

+40
-1
lines changed

2 files changed

+40
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: e971d0ce9f77120347287db9f2f46ec63a7b5510
9+
refs/heads/incoming: dae97b4812eda4a1c8301789cc27cd4f72d91b19
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/mk/platform.mk

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@ CFG_LDPATH_x86_64-unknown-linux-gnu :=
5959
CFG_RUN_x86_64-unknown-linux-gnu=$(2)
6060
CFG_RUN_TARG_x86_64-unknown-linux-gnu=$(call CFG_RUN_x86_64-unknown-linux-gnu,,$(2))
6161

62+
# i686-unknown-linux-gnu configuration
63+
CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
64+
CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
65+
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
66+
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32
67+
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti
68+
CFG_GCCISH_LINK_FLAGS_i6868-unknown-linux-gnu := -shared -fPIC -ldl -lpthread -lrt -g -m32
69+
CFG_GCCISH_DEF_FLAG_i6868-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
70+
CFG_GCCISH_PRE_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-whole-archive
71+
CFG_GCCISH_POST_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-no-whole-archive -Wl,-znoexecstack
72+
CFG_DEF_SUFFIX_i686-unknown-linux-gnu := .linux.def
73+
CFG_INSTALL_NAME_i686-unknown-linux-gnu =
74+
CFG_GCCISH_CROSS_i686-unknown-linux-gnu =
75+
6276
# x86_64-apple-darwin configuration
6377
CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
6478
CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
@@ -80,6 +94,19 @@ CFG_LDPATH_x86_64-apple-darwin :=
8094
CFG_RUN_x86_64-apple-darwin=$(2)
8195
CFG_RUN_TARG_x86_64-apple-darwin=$(call CFG_RUN_x86_64-apple-darwin,,$(2))
8296

97+
# i686-apple-darwin configuration
98+
CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
99+
CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
100+
CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
101+
CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
102+
CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
103+
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind -m32
104+
CFG_GCCISH_DEF_FLAG_i686-apple-darwin := -Wl,-exported_symbols_list,
105+
CFG_GCCISH_PRE_LIB_FLAGS_i686-apple-darwin :=
106+
CFG_GCCISH_POST_LIB_FLAGS_i686-apple-darwin :=
107+
CFG_DEF_SUFFIX_i686-apple-darwin := .darwin.def
108+
CFG_INSTALL_NAME_i686-apple-darwin = -Wl,-install_name,@rpath/$(1)
109+
83110
# arm-unknown-android configuration
84111
CFG_LIB_NAME_arm-unknown-android=lib$(1).so
85112
CFG_LIB_GLOB_arm-unknown-android=lib$(1)-*.so
@@ -148,6 +175,18 @@ CFG_LDPATH_i586-mingw32msvc :=
148175
CFG_RUN_i586-mingw32msvc=
149176
CFG_RUN_TARG_i586-mingw32msvc=
150177

178+
# x86_64-unknown-freebsd configuration
179+
CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
180+
CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
181+
CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd += -fPIC -I/usr/local/include
182+
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd += -shared -fPIC -lpthread -lrt
183+
CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=
184+
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-whole-archive
185+
CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-no-whole-archive
186+
CFG_DEF_SUFFIX_x86_64-unknown-freebsd := .bsd.def
187+
CFG_INSTALL_NAME_x86_64-unknown-freebsd =
188+
CFG_GCCISH_CROSS_x86_64-unknown-freebsd =
189+
151190
# Hack: not sure how to test if a file exists in make other than this
152191
OS_SUPP = $(patsubst %,--suppressions=%,\
153192
$(wildcard $(CFG_SRC_DIR)src/etc/$(CFG_OSTYPE).supp*))

0 commit comments

Comments
 (0)