Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 0f963cb in mainline


Ignore:
Timestamp:
2011-08-17T19:58:53Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
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:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rb705ecc r0f963cb  
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727#
     28
     29# Just for this Makefile. Sub-makes will run in parallel if requested.
     30.NOTPARALLEL:
    2831
    2932CSCOPE = cscope
  • uspace/app/binutils/Makefile

    rb705ecc r0f963cb  
    3232# When redefined to 'y' on the command line, certain areas of this Makefile
    3333# behave slightly differently to simplify the maintenance of binutils port.
    34 MAINTAIN_BINUTILS=n
     34MAINTAIN_BINUTILS = n
    3535
    3636# Information for obtaining specific binutils redistributable package.
     
    152152all: $(COMMON_MAKEFILE_PATCHED) all_ $(TOOLCHAIN) $(BINUTILS_PATCHED) \
    153153                $(CONFOBJ_OBJECT) $(BINUTILS_CONFIGURED) $(REDIST_DETECT)
    154         make -C $(REDIST_DIR) $(MAKE_TARGETS)
     154        $(MAKE) -C $(REDIST_DIR) $(MAKE_TARGETS)
    155155        cp -f $(REDIST_DIR)/gas/as-new $(BIN_DIR)/as
    156156        cp -f $(REDIST_DIR)/ld/ld-new $(BIN_DIR)/ld
     
    186186
    187187# Generate false toolchain scripts.
    188 $(TOOLCHAIN): $(TOOLCHAIN_SCRIPT)
     188$(TOOLCHAIN): $(TOOLCHAIN_SCRIPT) $(COMMON_MAKEFILE_PATCHED)
    189189        ./$< gcc $(CC) \
    190190                '$(CFLAGS)' '$(LINKER_SCRIPT)' '$(LIBS) $(BASE_LIBS) $(CONFOBJ_OBJECT)'
     
    205205# Configure binutils.
    206206# $LD variable have to exported to override configure script caching.
    207 $(BINUTILS_CONFIGURED): $(REDIST_DIR)/configure $(REDIST_DETECT)
     207$(BINUTILS_CONFIGURED): $(REDIST_DETECT) $(BINUTILS_PATCHED) \
     208                $(TOOLCHAIN) $(CONFOBJ_OBJECT)
    208209        export LD=ld; \
    209210        cd $(REDIST_DIR); \
Note: See TracChangeset for help on using the changeset viewer.