Support building from within root directory

[riscv-isa-sim.git] / configure

diff --git a/configure b/configure
index 6eae9bf0d92c3171516d931347f978f082358b3a..fbbd294db8bfc9acf0d7714d18f630b471f65f2e 100755 (executable)
--- a/configure
+++ b/configure
@@ -4006,9 +4006,9 @@ fi
 # Default compiler flags
 #-------------------------------------------------------------------------
 
-CFLAGS="-Wall -O2 -Wno-unused"
+CFLAGS="-Wall -Wno-unused -O2"
 
-CXXFLAGS="-Wall -O2 -std=c++11"
+CXXFLAGS="-Wall -Wno-unused -O2 -std=c++11"
 
 
 #-------------------------------------------------------------------------
@@ -4077,7 +4077,7 @@ $as_echo "#define RISCV_ENABLED /**/" >>confdefs.h
 if test "${with_fesvr+set}" = set; then :
   withval=$with_fesvr;
     LDFLAGS="-L$withval/lib $LDFLAGS"
-    CFLAGS="-I$withval/include $CFLAGS"
+    CPPFLAGS="-I$withval/include $CPPFLAGS"
 
 
 fi
@@ -4301,6 +4301,51 @@ $as_echo "#define HWACHA_ENABLED /**/" >>confdefs.h
 
 
 
+    # Add subproject to our running list
+
+    subprojects="$subprojects dummy_rocc"
+
+    # Process the subproject appropriately. If enabled add it to the
+    # $enabled_subprojects running shell variable, set a
+    # SUBPROJECT_ENABLED C define, and include the appropriate
+    # 'subproject.ac'.
+
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : dummy_rocc" >&5
+$as_echo "$as_me: configuring default subproject : dummy_rocc" >&6;}
+      ac_config_files="$ac_config_files dummy_rocc.mk:dummy_rocc/dummy_rocc.mk.in"
+
+      enable_dummy_rocc_sproj="yes"
+      subprojects_enabled="$subprojects_enabled dummy_rocc"
+
+$as_echo "#define DUMMY_ROCC_ENABLED /**/" >>confdefs.h
+
+
+
+
+
+
+    # Determine if this is a required or an optional subproject
+
+
+
+    # Determine if there is a group with the same name
+
+
+
+    # Create variations of the subproject name suitable for use as a CPP
+    # enabled define, a shell enabled variable, and a shell function
+
+
+
+
+
+
+
+
+
+
+
     # Add subproject to our running list
 
     subprojects="$subprojects softfloat"
@@ -4348,7 +4393,7 @@ $as_echo "#define SOFTFLOAT_ENABLED /**/" >>confdefs.h
 
     # Add subproject to our running list
 
-    subprojects="$subprojects spike"
+    subprojects="$subprojects spike_main"
 
     # Process the subproject appropriately. If enabled add it to the
     # $enabled_subprojects running shell variable, set a
@@ -4356,14 +4401,14 @@ $as_echo "#define SOFTFLOAT_ENABLED /**/" >>confdefs.h
     # 'subproject.ac'.
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : spike" >&5
-$as_echo "$as_me: configuring default subproject : spike" >&6;}
-      ac_config_files="$ac_config_files spike.mk:spike/spike.mk.in"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : spike_main" >&5
+$as_echo "$as_me: configuring default subproject : spike_main" >&6;}
+      ac_config_files="$ac_config_files spike_main.mk:spike_main/spike_main.mk.in"
 
-      enable_spike_sproj="yes"
-      subprojects_enabled="$subprojects_enabled spike"
+      enable_spike_main_sproj="yes"
+      subprojects_enabled="$subprojects_enabled spike_main"
 
-$as_echo "#define SPIKE_ENABLED /**/" >>confdefs.h
+$as_echo "#define SPIKE_MAIN_ENABLED /**/" >>confdefs.h
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -5147,8 +5192,9 @@ do
   case $ac_config_target in
     "riscv.mk") CONFIG_FILES="$CONFIG_FILES riscv.mk:riscv/riscv.mk.in" ;;
     "hwacha.mk") CONFIG_FILES="$CONFIG_FILES hwacha.mk:hwacha/hwacha.mk.in" ;;
+    "dummy_rocc.mk") CONFIG_FILES="$CONFIG_FILES dummy_rocc.mk:dummy_rocc/dummy_rocc.mk.in" ;;
     "softfloat.mk") CONFIG_FILES="$CONFIG_FILES softfloat.mk:softfloat/softfloat.mk.in" ;;
-    "spike.mk") CONFIG_FILES="$CONFIG_FILES spike.mk:spike/spike.mk.in" ;;
+    "spike_main.mk") CONFIG_FILES="$CONFIG_FILES spike_main.mk:spike_main/spike_main.mk.in" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;