Menu
▾
▴
[X10-commits] SF.net SVN: x10:[12783] trunk
|
From: <dgr...@us...> - 2010-02-01 21:09:56
|
Revision: 12783
http://x10.svn.sourceforge.net/x10/?rev=12783&view=rev
Author: dgrove-oss
Date: 2010-02-01 21:09:38 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Change to use $(LIBTOOL) instead of libtool
because on Macs, there is a libtool and it isn't GNU libtool
(which is glibtool).
Modified Paths:
--------------
trunk/x10.compiler/src/x10cpp/postcompiler/MacOSX_CXXCommandBuilder.java
trunk/x10.runtime/src-cpp/x10rt/Makefile
trunk/x10.runtime/src-cpp/x10rt/mpi/mpi.mk
trunk/x10.runtime/src-cpp/x10rt/pgas/pgas.mk
trunk/x10.runtime/src-cpp/x10rt/standalone/standalone.mk
Modified: trunk/x10.compiler/src/x10cpp/postcompiler/MacOSX_CXXCommandBuilder.java
===================================================================
--- trunk/x10.compiler/src/x10cpp/postcompiler/MacOSX_CXXCommandBuilder.java 2010-02-01 19:25:11 UTC (rev 12782)
+++ trunk/x10.compiler/src/x10cpp/postcompiler/MacOSX_CXXCommandBuilder.java 2010-02-01 21:09:38 UTC (rev 12783)
@@ -15,6 +15,10 @@
assert (CXXCommandBuilder.PLATFORM.startsWith("macosx_"));
}
+ protected String defaultPostCompiler() {
+ return "glibtool --mode=link --tag=CXX "+x10rtOpts.cxx;
+ }
+
protected boolean gcEnabled() { return true; }
protected void addPreArgs(ArrayList<String> cxxCmd) {
Modified: trunk/x10.runtime/src-cpp/x10rt/Makefile
===================================================================
--- trunk/x10.runtime/src-cpp/x10rt/Makefile 2010-02-01 19:25:11 UTC (rev 12782)
+++ trunk/x10.runtime/src-cpp/x10rt/Makefile 2010-02-01 21:09:38 UTC (rev 12783)
@@ -6,7 +6,15 @@
WGET ?= wget
TAR ?= tar
GZIP ?= gzip
+LIBTOOL ?= libtool
+ifeq ($(X10RT_PLATFORM), darwin)
+LIBTOOL = glibtool
+endif
+ifeq ($(X10RT_PLATFORM), darwin64)
+LIBTOOL = glibtool
+endif
+
# these are used only for building tests
CXXFLAGS += -Iinclude -Icommon
LDFLAGS += -Llib -lpthread
@@ -39,10 +47,10 @@
include standalone/standalone.mk
%.lo: %.cc
- libtool --mode=compile $(CXX) $(CXXFLAGS) -c $< -o $@
+ $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) -c $< -o $@
install: $(LIBS) $(PROPERTIES)
- libtool --mode=install $(CP) $(LIBS) $(X10_HOME)/x10.dist/lib
+ $(LIBTOOL) --mode=install $(CP) $(LIBS) $(X10_HOME)/x10.dist/lib
$(CP) $(PROPERTIES) $(X10_HOME)/x10.dist/etc
$(CP) include/*.h $(X10_HOME)/x10.dist/include
(test -n "$(EXECUTABLES)" && $(CP) $(EXECUTABLES) $(X10_HOME)/x10.dist/bin) || true
@@ -65,7 +73,7 @@
clean:
$(RM) -r */*.o bin/* etc/*.properties test/*.mpi */*~ *~ core* vgcore* include/pgasrt*.h include/xlupc*.h
- libtool --mode=clean $(RM) */*.lo lib/*.la test/*.standalone test/*.pgas_* test/*.mpi_*
+ $(LIBTOOL) --mode=clean $(RM) */*.lo lib/*.la test/*.standalone test/*.pgas_* test/*.mpi_*
# vim: ts=8:sw=8:noet
# DO NOT DELETE
Modified: trunk/x10.runtime/src-cpp/x10rt/mpi/mpi.mk
===================================================================
--- trunk/x10.runtime/src-cpp/x10rt/mpi/mpi.mk 2010-02-01 19:25:11 UTC (rev 12782)
+++ trunk/x10.runtime/src-cpp/x10rt/mpi/mpi.mk 2010-02-01 21:09:38 UTC (rev 12783)
@@ -7,13 +7,13 @@
PROPERTIES += etc/x10rt_mpi.properties
%.mpi: %.cc lib/libx10rt_mpi.la
- libtool --mode=link --tag=CXX $(MPICXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) -lx10rt_mpi
+ $(LIBTOOL) --mode=link --tag=CXX $(MPICXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) -lx10rt_mpi
mpi/x10rt_mpi.lo: mpi/x10rt_mpi.cc
- libtool --mode=compile --tag=CXX $(MPICXX) $(CXXFLAGS) -c $< -o $@
+ $(LIBTOOL) --mode=compile --tag=CXX $(MPICXX) $(CXXFLAGS) -c $< -o $@
lib/libx10rt_mpi.la: mpi/x10rt_mpi.lo $(COMMON_OBJS)
- libtool --mode=link --tag=CXX $(MPICXX) -o $@ $^ -rpath ${X10_HOME}/x10.dist/lib
+ $(LIBTOOL) --mode=link --tag=CXX $(MPICXX) -o $@ $^ -rpath ${X10_HOME}/x10.dist/lib
etc/x10rt_mpi.properties:
@echo "CXX=$(MPICXX)" > $@
Modified: trunk/x10.runtime/src-cpp/x10rt/pgas/pgas.mk
===================================================================
--- trunk/x10.runtime/src-cpp/x10rt/pgas/pgas.mk 2010-02-01 19:25:11 UTC (rev 12782)
+++ trunk/x10.runtime/src-cpp/x10rt/pgas/pgas.mk 2010-02-01 21:09:38 UTC (rev 12783)
@@ -118,7 +118,7 @@
EXECUTABLES += bin/launcher bin/manager bin/daemon
%.pgas_sockets: %.cc lib/libx10rt_pgas_sockets.la
- libtool --mode=link $(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) $(SOCKETS_LDFLAGS) $(SOCKETS_LDLIBS)
+ $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) $(SOCKETS_LDFLAGS) $(SOCKETS_LDLIBS)
ifdef CUSTOM_PGAS
lib/libxlpgas_sockets.a: $(COMMON_OBJS) $(CUSTOM_PGAS)/lib/libxlpgas_sockets.a include/pgasrt.h
@@ -134,7 +134,7 @@
endif
lib/libx10rt_pgas_sockets.la: $(COMMON_OBJS) lib/libxlpgas_sockets.a
- libtool --mode=link $(CXX) -o $@ $(COMMON_OBJS) lib/libxlpgas_sockets.a -rpath ${X10_HOME}/x10.dist/lib
+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(COMMON_OBJS) lib/libxlpgas_sockets.a -rpath ${X10_HOME}/x10.dist/lib
etc/x10rt_pgas_sockets.properties:
@echo "CXX=$(CXX)" > $@
@@ -160,7 +160,7 @@
PROPERTIES += etc/x10rt_pgas_lapi.properties
%.pgas_lapi: %.cc lib/libx10rt_pgas_lapi.la
- libtool --mode=link $(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) $(LAPI_LDFLAGS) $(LAPI_LDLIBS)
+ $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) $(LAPI_LDFLAGS) $(LAPI_LDLIBS)
ifdef CUSTOM_PGAS
lib/libxlpgas_lapi.a: $(COMMON_OBJS) $(CUSTOM_PGAS)/lib/libxlpgas_lapi.a include/pgasrt.h
@@ -176,7 +176,7 @@
endif
lib/libx10rt_pgas_lapi.la: $(COMMON_OBJS) lib/libxlpgas_lapi.a
- libtool --mode=link $(CXX) -o $@ $(COMMON_OBJS) lib/libxlpgas_lapi.a -rpath ${X10_HOME}/x10.dist/lib
+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(COMMON_OBJS) lib/libxlpgas_lapi.a -rpath ${X10_HOME}/x10.dist/lib
etc/x10rt_pgas_lapi.properties:
echo "CXX=$(CXX)" > $@
@@ -214,7 +214,7 @@
endif
lib/libx10rt_pgas_bgp.la: $(COMMON_OBJS) lib/libxlpgas_bgp.a
- libtool --mode=link $(CXX) -o $@ $(COMMON_OBJS) lib/libxlpgas_bgp.a -rpath ${X10_HOME}/x10.dist/lib
+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(COMMON_OBJS) lib/libxlpgas_bgp.a -rpath ${X10_HOME}/x10.dist/lib
etc/x10rt_pgas_bgp.properties:
@echo "CXX=$(CXX)" > $@
Modified: trunk/x10.runtime/src-cpp/x10rt/standalone/standalone.mk
===================================================================
--- trunk/x10.runtime/src-cpp/x10rt/standalone/standalone.mk 2010-02-01 19:25:11 UTC (rev 12782)
+++ trunk/x10.runtime/src-cpp/x10rt/standalone/standalone.mk 2010-02-01 21:09:38 UTC (rev 12783)
@@ -5,10 +5,10 @@
PROPERTIES += etc/x10rt_standalone.properties
%.standalone: %.cc lib/libx10rt_standalone.la
- libtool --mode=link $(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) -lx10rt_standalone
+ $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS) -lx10rt_standalone
lib/libx10rt_standalone.la: standalone/x10rt_standalone.lo $(COMMON_OBJS)
- libtool --mode=link $(CXX) -o $@ $^ -rpath ${X10_HOME}/x10.dist/lib
+ $(LIBTOOL) --mode=link $(CXX) -o $@ $^ -rpath ${X10_HOME}/x10.dist/lib
etc/x10rt_standalone.properties:
@echo "CXX=$(CXX)" > $@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
