File tree 1 file changed +12
-2
lines changed
1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change 111
111
# cygwin opensshd & bash. So mkmf will convert compiler paths, e.g. -IC:/... to
112
112
# cygwin paths, -I/cygdrive/c/..., which confuses mingw-w64. So specify the build
113
113
# target explicitly.
114
- special_flags += " CPPFLAGS='-DFD_SETSIZE=2048' debugflags=-g --build x86_64-w64-mingw32 "
114
+ special_flags += " CPPFLAGS='-DFD_SETSIZE=2048' debugflags=-g "
115
+
116
+ if platform . architecture == "x64"
117
+ special_flags += " --build x86_64-w64-mingw32 "
118
+ else
119
+ special_flags += " --build i686-w64-mingw32 "
120
+ end
115
121
end
116
122
117
123
without_dtrace = [
221
227
rbconfig_changes [ "LDFLAGS" ] = "-L. -Wl,-rpath=/opt/puppetlabs/puppet/lib -fstack-protector -rdynamic -Wl,-export-dynamic -L/opt/puppetlabs/puppet/lib"
222
228
end
223
229
elsif platform . is_windows?
224
- rbconfig_changes [ "CC" ] = "x86_64-w64-mingw32-gcc"
230
+ if platform . architecture == "x64"
231
+ rbconfig_changes [ "CC" ] = "x86_64-w64-mingw32-gcc"
232
+ else
233
+ rbconfig_changes [ "CC" ] = "i686-w64-mingw32-gcc"
234
+ end
225
235
end
226
236
227
237
pkg . add_source ( "file://resources/files/ruby_vendor_gems/operating_system.rb" )
You can’t perform that action at this time.
0 commit comments