diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:28:31 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:28:31 +0200 |
| commit | 0138137f1ccea480fe31cea3b63a81f96daeeaa7 (patch) | |
| tree | ffd88f1e805cd98152828c1598fc3255b3d22a9e /Makerules | |
| parent | 27fbc2008d4df23885d10f0877caf62ae2c22bb4 (diff) | |
| parent | dc665715841aea049480d9f75ace426419db1f8e (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
hurd/Makefile
nptl/sysdeps/pthread/bits/libc-lock.h
sysdeps/i386/configure
sysdeps/powerpc/powerpc32/configure
sysdeps/powerpc/powerpc64/configure
sysdeps/unix/sysv/linux/configure
sysdeps/unix/sysv/linux/configure.in
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -1,4 +1,4 @@ -# Copyright (C) 1991-2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1991-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -1107,6 +1107,8 @@ ifdef headers # headers in the sysdeps tree. $(inst_includedir)/%.h: $(objpfx)%.h $(+force) $(do-install) +$(inst_includedir)/%.h: $(common-objpfx)%.h $(+force) + $(do-install) $(inst_includedir)/%.h: %.h $(+force) $(do-install) $(inst_includedir)/%.h: $(..)include/%.h $(+force) @@ -1159,14 +1161,6 @@ $(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \ $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F) endef -# Command to compile $< in $(common-objdir) using the native libraries. -# We must cd to $(objdir) anyway so that $(..)config.h is valid. -define common-objdir-compile -$(patsubst %/,cd % &&,$(objpfx)) \ -$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \ - $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(..)$(@F) -endef - # We always want to use configuration definitions. # Note that this is only used for commands running in $(objpfx). ALL_BUILD_CFLAGS = $(BUILD_CFLAGS) -include $(..)config.h |