Skip to content

Commit

Permalink
pass along CFLAGS/LINK_FLAGS to libuv
Browse files Browse the repository at this point in the history 
Closes #6142
  • Loading branch information
@thestinger
thestinger committed May 2, 2013
1 parent 08dd625 commit d6697e7
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions mk/rt.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,16 @@ endif
ifdef CFG_WINDOWSY_$(1)
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
CFLAGS="$$(CFG_GCCISH_CFLAGS)" \
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS)" \
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
OS=mingw \
V=$$(VERBOSE)
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
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))" \
Expand All @@ -181,8 +183,8 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
else
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
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))" \
Expand Down

5 comments on commit d6697e7

@bors
Copy link
Contributor

@bors bors commented on d6697e7 May 2, 2013

Choose a reason for hiding this comment

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

saw approval from thestinger
at https://github.com/thestinger/rust/commit/d6697e702774c422871499826e7d346320610242

@bors
Copy link
Contributor

@bors bors commented on d6697e7 May 2, 2013

Choose a reason for hiding this comment

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

merging thestinger/rust/libuv_optimize = d6697e7 into auto

@bors
Copy link
Contributor

@bors bors commented on d6697e7 May 2, 2013

Choose a reason for hiding this comment

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

thestinger/rust/libuv_optimize = d6697e7 merged ok, testing candidate = 89377ea

@bors
Copy link
Contributor

@bors bors commented on d6697e7 May 2, 2013

Choose a reason for hiding this comment

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

all tests pass:
http://buildbot.rust-lang.org/builders/auto-linux/builds/1040
http://buildbot.rust-lang.org/builders/auto-win/builds/1037
http://buildbot.rust-lang.org/builders/auto-mac/builds/1048

@bors
Copy link
Contributor

@bors bors commented on d6697e7 May 2, 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 = 89377ea

Please sign in to comment.