Patchwork [ping] Re: [patch v2] support for multiarch systems

login
register
mail settings
Submitter Matthias Klose
Date Nov. 15, 2012, 11:57 a.m.
Message ID <50A4D8BF.2030202@ubuntu.com>
Download mbox | patch
Permalink /patch/199261/
State New
Headers show

Comments

Matthias Klose - Nov. 15, 2012, 11:57 a.m.
Am 15.11.2012 12:41, schrieb Eric Botcazou:
>> re-attaching the updated patch with the fixed comment in genmultilib.
> 
> This has introduced:
> 
> make[3]: Leaving directory `/red.a/gnatmail/gcc-x/build-red/x86_64-
> linux/gnat/obj/libdecnumber'
> make[3]: Entering directory `/red.a/gnatmail/gcc-x/build-red/x86_64-
> linux/gnat/obj/gcc'
> Makefile:538: Extraneous text after `else' directive
> Makefile:541: *** only one `else' per conditional.  Stop.

ahh, this is with GNU make 3.80. Checked in the following patch as obvious.

  Matthias
Eric Botcazou - Nov. 15, 2012, 4:31 p.m.
> ahh, this is with GNU make 3.80. Checked in the following patch as obvious.

Thanks!

Patch

2012-11-15  Matthias Klose  <doko@ubuntu.com>

	* Makefile.in (if_multiarch): Don't use a GNU make 3.81 feature.

Index: Makefile.in
===================================================================
--- Makefile.in	(Revision 193528)
+++ Makefile.in	(Arbeitskopie)
@@ -535,11 +535,13 @@ 
 with_float = @with_float@
 ifeq ($(enable_multiarch),yes)
   if_multiarch = $(1)
-else ifeq ($(enable_multiarch),auto)
-  # SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac
-  if_multiarch = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1))
 else
-  if_multiarch =
+  ifeq ($(enable_multiarch),auto)
+    # SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac
+    if_multiarch = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1))
+  else
+    if_multiarch =
+  endif
 endif
 
 # ------------------------