trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject git commit: TS-2711 Make luajit build with correct compiler (breaks on e.g. FreeBSD10)
Date Tue, 06 May 2014 17:06:58 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 8340eff6e -> 7d2833e74


TS-2711 Make luajit build with correct compiler (breaks on e.g. FreeBSD10)


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7d2833e7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7d2833e7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7d2833e7

Branch: refs/heads/master
Commit: 7d2833e74fe1d3a8ebea1f05c099d10db1ed49dc
Parents: 8340eff
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Tue May 6 11:06:37 2014 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Tue May 6 11:06:41 2014 -0600

----------------------------------------------------------------------
 lib/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7d2833e7/lib/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 48bb037..6d8dee6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -42,7 +42,7 @@ all-local:
 	@echo "Making all in luajit"
 	test -d "$(top_srcdir)/$(subdir)/luajit/src" || (cd "$(top_srcdir)" && git submodule
update --init)
 	test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
-	cd luajit && $(MAKE) PREFIX=$(prefix)
+	cd luajit && $(MAKE) $(AM_MAKEFLAGS) PREFIX="$(prefix)" CC="$(CC)" CFLAGS="$(CFLAGS)"
 
 clean-local:
 	test "$(top_srcdir)" != "$(top_builddir)" || (cd "$(top_builddir)/$(subdir)/luajit" &&
make clean)


Mime
View raw message