summaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorVikram S. Adve <vadve@cs.uiuc.edu>2002-09-20 16:15:57 +0000
committerVikram S. Adve <vadve@cs.uiuc.edu>2002-09-20 16:15:57 +0000
commit12520cdab483a92a3137cfbf8ac34eddfc9345d6 (patch)
tree12f8a6d72ca42854b4a4919e26a21da0335d8027 /Makefile.common
parentc4f67270f30975e31ded798ed207ea6bfd645359 (diff)
downloadllvm-12520cdab483a92a3137cfbf8ac34eddfc9345d6.tar.gz
llvm-12520cdab483a92a3137cfbf8ac34eddfc9345d6.tar.bz2
llvm-12520cdab483a92a3137cfbf8ac34eddfc9345d6.tar.xz
Fix link error for profile version. Also, build Burg differently
for different architectures. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3862 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common
index 5151135a55..40818d82f9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -126,7 +126,7 @@ endif
# Special tools used while building the LLVM tree. Burg is built as part of the
# utils directory.
#
-BURG := $(LEVEL)/utils/Burg/burg
+BURG := $(LEVEL)/utils/Burg/burg.$(UNAME)
RunBurg := $(BURG) $(BURG_OPTS)
@@ -167,7 +167,7 @@ Link := $(CXX)
endif
LinkG := $(Link) -g -L $(LIBDEBUG) $(STRIP)
LinkO := $(Link) -O3 -L $(LIBRELEASE)
-LinkP := $(LinkO) $(PROFILE)
+LinkP := $(Link) -O3 -L $(LIBPROFILE) $(PROFILE)
# Create one .o file from a bunch of .o files...
Relink = ld -r
@@ -358,9 +358,9 @@ ifndef ENABLE_OPTIMIZED
TOOLEXENAMES := $(TOOLEXENAME_G)
else
ifdef ENABLE_PROFILING
- TOOLEXENAMES := $(TOOLEXENAME_O)
- else
TOOLEXENAMES := $(TOOLEXENAME_P)
+ else
+ TOOLEXENAMES := $(TOOLEXENAME_O)
endif
endif