diff options
| author | Andrew Waterman <waterman@eecs.berkeley.edu> | 2014-01-24 01:23:08 -0800 |
|---|---|---|
| committer | Andrew Waterman <waterman@eecs.berkeley.edu> | 2014-01-24 01:24:20 -0800 |
| commit | 471a5fe748e0b5c3070ad50cce602417f5a5aad6 (patch) | |
| tree | e189458f803cdb34de98dc66f0feec28c9702e89 | |
| parent | 4a2f98e35f30f3d2e252f068d4afc65cfe2cb0fe (diff) | |
| download | spike-471a5fe748e0b5c3070ad50cce602417f5a5aad6.zip spike-471a5fe748e0b5c3070ad50cce602417f5a5aad6.tar.gz spike-471a5fe748e0b5c3070ad50cce602417f5a5aad6.tar.bz2 | |
Build and use shared libraries only
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | riscv/riscv.ac | 4 |
3 files changed, 6 insertions, 5 deletions
@@ -4006,7 +4006,7 @@ fi CFLAGS="-Wall -O2 -Wno-unused" -CXXFLAGS="-Wall -O2 -std=c++0x" +CXXFLAGS="-Wall -O2 -std=c++11" #------------------------------------------------------------------------- @@ -4087,7 +4087,7 @@ if ${ac_cv_lib_pthread_pthread_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-lfesvr -pthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 44fd31a..d683cc5 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ m4_define( proj_version, [?]) # Setup #------------------------------------------------------------------------- +AC_LANG_CPLUSPLUS AC_INIT(proj_name,proj_version,proj_maintainer,proj_abbreviation) AC_CONFIG_SRCDIR([riscv/common.h]) AC_CONFIG_AUX_DIR([scripts]) @@ -72,7 +73,7 @@ AC_HEADER_STDC #------------------------------------------------------------------------- AC_SUBST([CFLAGS], ["-Wall -O2 -Wno-unused"]) -AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++0x"]) +AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++11"]) #------------------------------------------------------------------------- # MCPPBS subproject list diff --git a/riscv/riscv.ac b/riscv/riscv.ac index 36a5b6f..a65039b 100644 --- a/riscv/riscv.ac +++ b/riscv/riscv.ac @@ -7,9 +7,9 @@ AC_ARG_WITH([fesvr], ] ) -AC_CHECK_LIB(pthread, pthread_create, [], [AC_MSG_ERROR([libpthread is required])]) +AC_CHECK_LIB(fesvr, libfesvr_is_present, [], [AC_MSG_ERROR([libfesvr is required])], [-pthread]) -AC_CHECK_LIB(fesvr, libfesvr_is_present, [], [AC_MSG_ERROR([libfesvr is required])]) +AC_CHECK_LIB(pthread, pthread_create, [], [AC_MSG_ERROR([libpthread is required])]) AC_ARG_ENABLE([fpu], AS_HELP_STRING([--disable-fpu], [Disable floating-point])) AS_IF([test "x$enable_fpu" != "xno"], [ |