From 2a22a9f0f355b63da5515c0ee183e5e516a3a551b22273385e3189a1d5c742e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 19 Jun 2013 22:06:48 +0000
Subject: [PATCH] Fixing build once again

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=236
---
 llvm.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/llvm.spec b/llvm.spec
index 381a0e7..e5b1724 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -62,10 +62,6 @@ BuildRequires:  flex
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  groff
-%ifarch x86_64
-# For tests
-BuildRequires:  glibc-devel-32bit
-%endif
 BuildRequires:  libffi-devel
 BuildRequires:  libtool
 BuildRequires:  python-base
@@ -154,6 +150,13 @@ rm tools/clang/test/Driver/x86_features.c
 sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
 sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
 
+%if "%{_lib}" == "lib64"
+# Nasty hardcoded path
+sed -i s,/lib/,/%{_lib}/,g tools/clang/lib/Driver/Tools.cpp  \
+                           tools/clang/test/Driver/linux-ld.c \
+                           tools/clang/test/Preprocessor/iwithprefix.c
+%endif
+
 # Only enable target archs otherwise llvm-config is messed up
 sed -i s,"subdirectories = .*","subdirectories = AArch64 ARM PowerPC R600 X86", lib/Target/LLVMBuild.txt
 sed -i s,"IntelJITEvents OProfileJIT","", lib/ExecutionEngine/LLVMBuild.txt
@@ -200,7 +203,7 @@ cmake -G "Unix Makefiles" \
       -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \
       -DCMAKE_CXX_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \
 %endif
-%ifarch x86_64
+%if "%{_lib}" == "lib64"
       -DLLVM_LIBDIR_SUFFIX=64 \
       -DCLANG_RESOURCE_DIR=../%{_lib}/clang/%{_release_version} \
 %endif
@@ -227,6 +230,10 @@ cd stage2
 %if 0%{!?qemu_user_space_build:1}
 # we just do not have enough memory with qemu emulation
 
+%if "%{_lib}" == "lib64"
+ln -s lib lib64
+%endif
+
 # Due to http://llvm.org/bugs/show_bug.cgi?id=15242
 for i in crash-narrowfunctiontest metadata remove_arguments_test; do
     rm ../test/BugPoint/$i.ll;