diff mbox

[Ada] Fix multilib breakage on x86-64/Darwin

Message ID 201102082353.12039.ebotcazou@adacore.com
State New
Headers show

Commit Message

Eric Botcazou Feb. 8, 2011, 10:53 p.m. UTC 
The 32-bit Ada library doesn't build on x86-64/Darwin.

Tested on x86_64-apple-darwin10.2.0, applied on the mainline and 4.5 branch.


2011-02-08  Eric Botcazou  <ebotcazou@adacore.com>

	* gcc-interface/Makefile.in (x86-64 darwin): Handle multilibs.
diff mbox

Patch

Index: gcc-interface/Makefile.in
===================================================================
--- gcc-interface/Makefile.in	(revision 169914)
+++ gcc-interface/Makefile.in	(working copy)
@@ -2142,12 +2142,18 @@  ifeq ($(strip $(filter-out darwin%,$(osy
     s-taprop.adb<s-taprop-posix.adb \
     s-taspri.ads<s-taspri-posix.ads \
     s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
-    a-numaux.ads<a-numaux-x86.ads \
-    a-numaux.adb<a-numaux-x86.adb \
     g-trasym.ads<g-trasym-unimplemented.ads \
     g-trasym.adb<g-trasym-unimplemented.adb \
-    system.ads<system-darwin-x86_64.ads \
+    a-numaux.ads<a-numaux-x86.ads \
+    a-numaux.adb<a-numaux-x86.adb \
     $(ATOMICS_TARGET_PAIRS)
+    ifeq ($(strip $(MULTISUBDIR)),/i386)
+      LIBGNAT_TARGET_PAIRS += \
+      system.ads<system-darwin-x86.ads
+    else
+      LIBGNAT_TARGET_PAIRS += \
+      system.ads<system-darwin-x86_64.ads
+    endif
   endif
 
   ifeq ($(strip $(filter-out powerpc%,$(arch))),)