Changeset 0f963cb in mainline

Timestamp:

2011-08-17T19:58:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ee24574

Parents:

b705ecc (diff), bb285b4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge binutils changes.

Files:

• Makefile (modified) (1 diff)
• uspace/app/binutils/Makefile (modified) (4 diffs)

Makefile

@@ -26 +26 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
+# Just for this Makefile. Sub-makes will run in parallel if requested.
+.NOTPARALLEL:
 
 CSCOPE = cscope

uspace/app/binutils/Makefile

@@ -32 +32 @@
 # When redefined to 'y' on the command line, certain areas of this Makefile
 # behave slightly differently to simplify the maintenance of binutils port.
-MAINTAIN_BINUTILS=n
+MAINTAIN_BINUTILS = n
 
 # Information for obtaining specific binutils redistributable package.
@@ -152 +152 @@
 all: $(COMMON_MAKEFILE_PATCHED) all_ $(TOOLCHAIN) $(BINUTILS_PATCHED) \
                 $(CONFOBJ_OBJECT) $(BINUTILS_CONFIGURED) $(REDIST_DETECT)
-        make -C $(REDIST_DIR) $(MAKE_TARGETS)
+        $(MAKE) -C $(REDIST_DIR) $(MAKE_TARGETS)
         cp -f $(REDIST_DIR)/gas/as-new $(BIN_DIR)/as
         cp -f $(REDIST_DIR)/ld/ld-new $(BIN_DIR)/ld
@@ -186 +186 @@
 
 # Generate false toolchain scripts.
-$(TOOLCHAIN): $(TOOLCHAIN_SCRIPT)
+$(TOOLCHAIN): $(TOOLCHAIN_SCRIPT) $(COMMON_MAKEFILE_PATCHED)
         ./$< gcc $(CC) \
                 '$(CFLAGS)' '$(LINKER_SCRIPT)' '$(LIBS) $(BASE_LIBS) $(CONFOBJ_OBJECT)'
@@ -205 +205 @@
 # Configure binutils.
 # $LD variable have to exported to override configure script caching.
-$(BINUTILS_CONFIGURED): $(REDIST_DIR)/configure $(REDIST_DETECT)
+$(BINUTILS_CONFIGURED): $(REDIST_DETECT) $(BINUTILS_PATCHED) \
+                $(TOOLCHAIN) $(CONFOBJ_OBJECT)
         export LD=ld; \
         cd $(REDIST_DIR); \