aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makerules8
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b8ba409..1e22a45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-24 Joseph Myers <joseph@codesourcery.com>
+
+ * Makerules (native-compile): Do not change working directory for
+ build. Use $(OUTPUT_OPTION) in command.
+ (ALL_BUILD_CFLAGS): Use $(common-objpfx) to find config.h.
+
2012-04-24 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
[BZ #13886]
diff --git a/Makerules b/Makerules
index d184be6..a9b1786 100644
--- a/Makerules
+++ b/Makerules
@@ -1114,17 +1114,15 @@ install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \
endif
install: install-no-libc.a-nosubdir
-# Command to compile $< in $(objdir) using the native libraries.
+# Command to compile $< using the native libraries.
define native-compile
$(make-target-directory)
-$(patsubst %/,cd % &&,$(objpfx)) \
$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \
- $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F)
+ $< $(OUTPUT_OPTION)
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
+ALL_BUILD_CFLAGS = $(BUILD_CFLAGS) -include $(common-objpfx)config.h
# Support the GNU standard name for this target.
.PHONY: check