Skip to content

Commit e2479b8

Browse files
thestingerthestinger
committed
pass correct CFLAGS for jemalloc
1 parent 121ad1c commit e2479b8

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

‎mk/platform.mk

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ CFG_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).so
145145
CFG_STATIC_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).a
146146
CFG_LIB_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.so
147147
CFG_LIB_DSYM_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
148+
CFG_CFLAGS_x86_64-unknown-linux-gnu := -m64
148149
CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64
149150
CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
150151
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m64
@@ -172,6 +173,7 @@ CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
172173
CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a
173174
CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
174175
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
176+
CFG_CFLAGS_i686-unknown-linux-gnu := -m32
175177
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32
176178
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti
177179
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
@@ -201,6 +203,7 @@ AR_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos ar)
201203
CFG_LIB_NAME_arm-apple-darwin = lib$(1).dylib
202204
CFG_LIB_GLOB_arm-apple-darwin = lib$(1)-*.dylib
203205
CFG_LIB_DSYM_GLOB_arm-apple-darwin = lib$(1)-*.dylib.dSYM
206+
CFG_CFLAGS_arm-apple-darwin := $(CFG_IOS_FLAGS)
204207
CFG_GCCISH_CFLAGS_arm-apple-darwin := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS)
205208
CFG_GCCISH_CXXFLAGS_arm-apple-darwin := -fno-rtti $(CFG_IOS_FLAGS)
206209
CFG_GCCISH_LINK_FLAGS_arm-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
@@ -229,6 +232,7 @@ CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
229232
CFG_STATIC_LIB_NAME_x86_64-apple-darwin=lib$(1).a
230233
CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
231234
CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
235+
CFG_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64
232236
CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64
233237
CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti
234238
CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread -framework CoreServices -m64
@@ -256,6 +260,7 @@ CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
256260
CFG_STATIC_LIB_NAME_i686-apple-darwin=lib$(1).a
257261
CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
258262
CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
263+
CFG_CFLAGS_i686-apple-darwin := -m32 -arch i386
259264
CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
260265
CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
261266
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread -framework CoreServices -m32
@@ -283,6 +288,7 @@ CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
283288
CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
284289
CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
285290
CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
291+
CFG_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__
286292
CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__
287293
CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti
288294
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
@@ -313,6 +319,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
313319
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
314320
CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
315321
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
322+
CFG_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__
316323
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__
317324
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti
318325
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g
@@ -343,6 +350,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
343350
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
344351
CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
345352
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
353+
CFG_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp
346354
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp
347355
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti
348356
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
@@ -372,6 +380,7 @@ CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
372380
CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a
373381
CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
374382
CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
383+
CFG_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh
375384
CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh
376385
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti
377386
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
@@ -400,6 +409,7 @@ CFG_LIB_NAME_i686-pc-mingw32=$(1).dll
400409
CFG_STATIC_LIB_NAME_i686-pc-mingw32=$(1).lib
401410
CFG_LIB_GLOB_i686-pc-mingw32=$(1)-*.dll
402411
CFG_LIB_DSYM_GLOB_i686-pc-mingw32=$(1)-*.dylib.dSYM
412+
CFG_CFLAGS_mips-i686-pc-mingw32 := -m32 -march=i686 -D_WIN32_WINNT=0x0600
403413
CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -m32 -march=i686 -D_WIN32_WINNT=0x0600 -I$(CFG_SRC_DIR)src/etc/mingw-fix-include
404414
CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti
405415
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g -m32
@@ -428,6 +438,7 @@ CFG_LIB_NAME_i586-mingw32msvc=$(1).dll
428438
CFG_STATIC_LIB_NAME_i586-mingw32msvc=$(1).lib
429439
CFG_LIB_GLOB_i586-mingw32msvc=$(1)-*.dll
430440
CFG_LIB_DSYM_GLOB_i586-mingw32msvc=$(1)-*.dylib.dSYM
441+
CFG_CFLAGS_i586-mingw32msvc := -march=i586 -m32
431442
CFG_GCCISH_CFLAGS_i586-mingw32msvc := -Wall -Werror -g -march=i586 -m32
432443
CFG_GCCISH_CXXFLAGS_i586-mingw32msvc := -fno-rtti
433444
CFG_GCCISH_LINK_FLAGS_i586-mingw32msvc := -shared -g -m32
@@ -458,6 +469,7 @@ CFG_LIB_NAME_i686-w64-mingw32=$(1).dll
458469
CFG_STATIC_LIB_NAME_i686-w64-mingw32=$(1).lib
459470
CFG_LIB_GLOB_i686-w64-mingw32=$(1)-*.dll
460471
CFG_LIB_DSYM_GLOB_i686-w64-mingw32=$(1)-*.dylib.dSYM
472+
CFG_CFLAGS_i586-w64-mingw32 := -march=i586 -m32 -D_WIN32_WINNT=0x0600
461473
CFG_GCCISH_CFLAGS_i686-w64-mingw32 := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600
462474
CFG_GCCISH_CXXFLAGS_i686-w64-mingw32 := -fno-rtti
463475
CFG_GCCISH_LINK_FLAGS_i686-w64-mingw32 := -shared -g -m32
@@ -487,6 +499,7 @@ CFG_LIB_NAME_x86_64-w64-mingw32=$(1).dll
487499
CFG_STATIC_LIB_NAME_x86_64-w64-mingw32=$(1).lib
488500
CFG_LIB_GLOB_x86_64-w64-mingw32=$(1)-*.dll
489501
CFG_LIB_DSYM_GLOB_x86_64-w64-mingw32=$(1)-*.dylib.dSYM
502+
CFG_CFLAGS_x86_64-w64-mingw32 := -m64 -D_WIN32_WINNT=0x0600
490503
CFG_GCCISH_CFLAGS_x86_64-w64-mingw32 := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600
491504
CFG_GCCISH_CXXFLAGS_x86_64-w64-mingw32 := -fno-rtti
492505
CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -g -m64
@@ -515,6 +528,7 @@ CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
515528
CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a
516529
CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
517530
CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM
531+
CFG_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include
518532
CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include
519533
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread -lrt
520534
CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=

‎mk/rt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ $$(JEMALLOC_LIB_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
260260
CC="$$(CC_$(1))" \
261261
AR="$$(AR_$(1))" \
262262
RANLIB="$$(AR_$(1)) s" \
263-
EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS)"
263+
EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1))"
264264
$$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
265265
$$(Q)cp $$(JEMALLOC_BUILD_DIR_$(1))/lib/$$(JEMALLOC_REAL_NAME_$(1)) $$(JEMALLOC_LIB_$(1))
266266

0 commit comments

Comments
 (0)