* sim/ucsim/cmd.src/Makefile.in ($(PRJDIR)/libcmd.a): Changed all ar references...

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1332 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 997214e756c912f6cef1633206d84ad6eae0d8eb..51d5dcebcafd0ff7029eff9934e9f84c05636c05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-30  Michael Hope  <michaelh@juju.net.nz>
+
+       * sim/ucsim/cmd.src/Makefile.in ($(PRJDIR)/libcmd.a): Changed all ar references to $(AR) for Solaris.
+
 2001-09-29  Michael Hope  <michaelh@juju.net.nz>
 
        * Makefile (sdcc-libs): Added makebin to the list of standard targets.

diff --git a/sim/ucsim/cmd.src/Makefile.in b/sim/ucsim/cmd.src/Makefile.in
index 85b49406c32bab736e9188760164f93685736a9c..3edbab35dcc9ff47d7e6d1e0f48b0fcbdfed23a3 100644 (file)
--- a/sim/ucsim/cmd.src/Makefile.in
+++ b/sim/ucsim/cmd.src/Makefile.in
@@ -91,7 +91,7 @@ include clean.mk
 cmdlib: $(PRJDIR)/libcmd.a
 
 $(PRJDIR)/libcmd.a: $(OBJECTS)
-       ar -rcu $*.a $(OBJECTS)
+       $(AR) -rcu $*.a $(OBJECTS)
        $(RANLIB) $*.a
 
 .cc.o:

diff --git a/sim/ucsim/gui.src/Makefile.in b/sim/ucsim/gui.src/Makefile.in
index 89d1c8c9d6670e6d829d0780e3a47f63f3e71c95..be24aca2a45ef8c3dda1e4fea344cd717125c5d6 100644 (file)
--- a/sim/ucsim/gui.src/Makefile.in
+++ b/sim/ucsim/gui.src/Makefile.in
@@ -135,13 +135,13 @@ include clean.mk
 ucsim_lib: $(PRJDIR)/libguiucsim.a
 
 $(PRJDIR)/libguiucsim.a: $(OBJECTS) $(UCSIM_OBJECTS)
-       ar -rcu $*.a $(OBJECTS) $(UCSIM_OBJECTS)
+       $(AR) -rcu $*.a $(OBJECTS) $(UCSIM_OBJECTS)
        $(RANLIB) $*.a
 
 tool_lib: $(PRJDIR)/libguitool.a
 
 $(PRJDIR)/libguitool.a: $(OBJECTS) $(TOOL_OBJECTS)
-       ar -rcu $*.a $(OBJECTS) $(TOOL_OBJECTS)
+       $(AR) -rcu $*.a $(OBJECTS) $(TOOL_OBJECTS)
        $(RANLIB) $*.a
 
 .cc.o:

diff --git a/sim/ucsim/main_in.mk b/sim/ucsim/main_in.mk
index 6abe0993e78452adfeeafea3a3ffb50c7a5994bf..a7bfd6364a766b61f84ada0834b08c20543d6ae4 100644 (file)
--- a/sim/ucsim/main_in.mk
+++ b/sim/ucsim/main_in.mk
@@ -101,7 +101,7 @@ include clean.mk
 # My rules
 # --------
 libutil.a: $(OBJECTS)
-       ar -rcu $*.a $(OBJECTS)
+       $(AR) -rcu $*.a $(OBJECTS)
        $(RANLIB) $*.a
 
 ucsim_app: libs ucsim

diff --git a/sim/ucsim/sim.src/Makefile.in b/sim/ucsim/sim.src/Makefile.in
index f02164b27a27409b2c2036b24e50989d2239b2ee..98fed8ecfc04bb0bb6f8bcd93806f3c150ad90ec 100644 (file)
--- a/sim/ucsim/sim.src/Makefile.in
+++ b/sim/ucsim/sim.src/Makefile.in
@@ -95,7 +95,7 @@ include clean.mk
 sim_lib: $(PRJDIR)/libsim.a
 
 $(PRJDIR)/libsim.a: $(OBJECTS)
-       ar -rcu $*.a $(OBJECTS)
+       $(AR) -rcu $*.a $(OBJECTS)
        $(RANLIB) $*.a
 
 .cc.o:

diff --git a/src/port.mk b/src/port.mk
index 2b2f83a3e203f3811d29077b26e5b003e68c4cd4..0fcc395cff937a0575676ea811a023dbc04f1f0c 100644 (file)
--- a/src/port.mk
+++ b/src/port.mk
@@ -30,7 +30,7 @@ include $(PRJDIR)/Makefile.common
 
 $(LIB): $(OBJ)
        rm -f $(LIB)
-       ar r $(LIB) $(OBJ)
+       $(AR) r $(LIB) $(OBJ)
        $(RANLIB) $(LIB)
 
 %.rul: %.def