[llvm-commits] CVS: llvm/Makefile.rules configure
Reid Spencer
reid at x10sys.com
Wed Mar 22 08:00:19 PST 2006
Changes in directory llvm:
Makefile.rules updated: 1.352 -> 1.353
configure updated: 1.213 -> 1.214
---
Log message:
These changes are necessary to support the new llvm-config tool. llvm-config
is a handy tool for users of LLVM who want to be able to quickly get
information about LLVM's configuration. It is intended to be used in the
command line of other tools. Documentation will be forthcoming in a
subsequent patch.
---
Diffs of the changes: (+53 -43)
Makefile.rules | 34 ++++++++++++++++++-------------
configure | 62 ++++++++++++++++++++++++++++++---------------------------
2 files changed, 53 insertions(+), 43 deletions(-)
Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.352 llvm/Makefile.rules:1.353
--- llvm/Makefile.rules:1.352 Mon Mar 20 19:06:41 2006
+++ llvm/Makefile.rules Wed Mar 22 09:59:55 2006
@@ -234,17 +234,17 @@
C.Flags += -DNDEBUG
endif
-CXX.Flags += $(CXXFLAGS)
-C.Flags += $(CFLAGS)
-CPP.Flags += $(CPPFLAGS)
-LD.Flags += $(LDFLAGS)
-AR.Flags := cru
+CXX.Flags += $(CXXFLAGS)
+C.Flags += $(CFLAGS)
+CPP.BaseFlags += $(CPPFLAGS)
+LD.Flags += $(LDFLAGS)
+AR.Flags := cru
LibTool.Flags := --tag=CXX
#Make Floating point ieee complient on alpha
ifeq ($(ARCH),Alpha)
- CXX.Flags += -mieee
- CPP.Flags += -mieee
+ CXX.Flags += -mieee
+ CPP.BaseFlags += -mieee
endif
#--------------------------------------------------------------------
@@ -360,13 +360,15 @@
CompileCommonOpts := -D_REENTRANT -D_HPUX_SOURCE
endif
-LD.Flags += -L$(LibDir) -L$(LLVMLibDir)
-CPP.Flags += -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \
- -I$(PROJ_OBJ_ROOT)/include \
- -I$(PROJ_SRC_ROOT)/include \
- -I$(LLVM_OBJ_ROOT)/include \
- -I$(LLVM_SRC_ROOT)/include \
- -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
+LD.Flags += -L$(LibDir) -L$(LLVMLibDir)
+CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
+# All -I flags should go here, so that they don't confuse llvm-config.
+CPP.Flags += -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \
+ -I$(PROJ_OBJ_ROOT)/include \
+ -I$(PROJ_SRC_ROOT)/include \
+ -I$(LLVM_OBJ_ROOT)/include \
+ -I$(LLVM_SRC_ROOT)/include \
+ $(CPP.BaseFlags)
Compile.C = $(CC) $(CPP.Flags) $(CompileCommonOpts) -c $(C.Flags)
LTCompile.C = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.C)
@@ -386,6 +388,7 @@
LTInstall = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) \
$(Install.Flags)
ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755
+ScriptInstall = $(INSTALL) -m 0755
DataInstall = $(INSTALL) -m 0644
Burg = $(BURG) -I $(PROJ_SRC_DIR)
TableGen = $(TBLGEN) -I $(PROJ_SRC_DIR) -I$(PROJ_SRC_ROOT)/include
@@ -635,6 +638,9 @@
ifeq ($(ARCH),Alpha)
USEDLIBS := $(subst LLVMCore, LLVMCore.a, $(USEDLIBS))
LLVMLIBS := $(subst LLVMCore, LLVMCore.a, $(LLVMLIBS))
+CORE_IS_ARCHIVE := 1
+else
+CORE_IS_ARCHIVE := 0
endif
ProjLibsOptions := $(patsubst %.a.o, -l%, $(addsuffix .o, $(USEDLIBS)))
Index: llvm/configure
diff -u llvm/configure:1.213 llvm/configure:1.214
--- llvm/configure:1.213 Sun Feb 26 23:39:00 2006
+++ llvm/configure Wed Mar 22 09:59:55 2006
@@ -8376,7 +8376,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8380 "configure"
+#line 8379 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10367,7 +10367,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 10371 "configure"' > conftest.$ac_ext
+ echo '#line 10370 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10852,7 +10852,7 @@
# Provide some information about the compiler.
-echo "$as_me:10856:" \
+echo "$as_me:10855:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -11909,11 +11909,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11913: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11912: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11917: \$? = $ac_status" >&5
+ echo "$as_me:11916: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12152,11 +12152,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12156: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12155: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12160: \$? = $ac_status" >&5
+ echo "$as_me:12159: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12212,11 +12212,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12216: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12215: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12220: \$? = $ac_status" >&5
+ echo "$as_me:12219: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14397,7 +14397,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14401 "configure"
+#line 14400 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14495,7 +14495,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14499 "configure"
+#line 14498 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16688,11 +16688,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16692: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16691: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16696: \$? = $ac_status" >&5
+ echo "$as_me:16695: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16748,11 +16748,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16752: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16751: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16756: \$? = $ac_status" >&5
+ echo "$as_me:16755: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18109,7 +18109,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18113 "configure"
+#line 18112 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18207,7 +18207,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18211 "configure"
+#line 18210 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19044,11 +19044,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19048: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19047: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19052: \$? = $ac_status" >&5
+ echo "$as_me:19051: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -19104,11 +19104,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19108: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19107: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19112: \$? = $ac_status" >&5
+ echo "$as_me:19111: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21143,11 +21143,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21147: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21146: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21151: \$? = $ac_status" >&5
+ echo "$as_me:21150: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -21386,11 +21386,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21390: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21389: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21394: \$? = $ac_status" >&5
+ echo "$as_me:21393: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -21446,11 +21446,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21450: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21449: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:21454: \$? = $ac_status" >&5
+ echo "$as_me:21453: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -23631,7 +23631,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 23635 "configure"
+#line 23634 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -23729,7 +23729,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 23733 "configure"
+#line 23732 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -30733,6 +30733,9 @@
ac_config_files="$ac_config_files docs/doxygen.cfg"
+ ac_config_files="$ac_config_files utils/llvm-config/llvm-config.in"
+
+
ac_config_commands="$ac_config_commands setup"
ac_config_commands="$ac_config_commands Makefile"
@@ -31317,6 +31320,7 @@
# Handling of arguments.
"Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
"docs/doxygen.cfg" ) CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
+ "utils/llvm-config/llvm-config.in" ) CONFIG_FILES="$CONFIG_FILES utils/llvm-config/llvm-config.in" ;;
"setup" ) CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
"Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
"Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;
More information about the llvm-commits
mailing list