Skip to content

Commit

Permalink
Pass the correct build flags to jemalloc
Browse files Browse the repository at this point in the history
Apparently the standard --build and --host flags don't actually
_do_ anything. This re-uses the libuv flags, since they are the
same for getting jemalloc to cross-compile
  • Loading branch information
Aatch committed Jun 10, 2013
1 parent e9c309c commit cf536e0
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion mk/rt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,15 @@ endif

$$(JEMALLOC_LIB_$(1)_$(2)):
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1)
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) \
EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
CC="$$(CC_$(1))" \
CXX="$$(CXX_$(1))" \
AR="$$(AR_$(1))"
$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc


# These could go in rt.mk or rustllvm.mk, they're needed for both.

# This regexp has a single $, escaped twice
Expand Down

5 comments on commit cf536e0

@bors
Copy link
Contributor

@bors bors commented on cf536e0 Jun 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at Aatch@cf536e0

@bors
Copy link
Contributor

@bors bors commented on cf536e0 Jun 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging Aatch/rust/incoming = cf536e0 into auto

@bors
Copy link
Contributor

@bors bors commented on cf536e0 Jun 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aatch/rust/incoming = cf536e0 merged ok, testing candidate = 2ff6b29

@bors
Copy link
Contributor

@bors bors commented on cf536e0 Jun 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on cf536e0 Jun 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = 2ff6b29

Please sign in to comment.