Merge branch 'aomp-epsdb' into aomp-epsdb-mainline

Change-Id: I0b212d68b201064b39429aa99a972cfac75b020a
ROCm · Oct 7, 2022 · 5f3f5f4 · 5f3f5f4
2 parents 4590916 + 612c140
commit 5f3f5f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/bin/aomp_common_vars b/bin/aomp_common_vars
@@ -101,7 +101,7 @@ fi
 
 # Set list of default amdgcn subarchitectures to build
 # Developers may override GFXLIST to shorten build time.
-GFXLIST=${GFXLIST:-"gfx700 gfx701 gfx801 gfx803 gfx900 gfx902 gfx906 gfx908 gfx90a gfx1030 gfx1031"}
+GFXLIST=${GFXLIST:-"gfx700 gfx701 gfx801 gfx803 gfx900 gfx902 gfx906 gfx908 gfx90a gfx1030 gfx1031 gfx1100 gfx1101 gfx1102 gfx1103"}
 export GFXLIST
 
 # Calculate the number of threads to use for make

diff --git a/bin/build_extras.sh b/bin/build_extras.sh
@@ -131,7 +131,12 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
   mkdir -p $BUILD_DIR/build/extras
   cd $BUILD_DIR/build/extras
 
-  SED_INSTALL_DIR=`echo $INSTALL_EXTRAS | sed -e 's/\//\\\\\//g' `
+  if [ $AOMP_STANDALONE_BUILD == 0 ] ; then
+    SED_INSTALL_DIR=`echo /opt/rocm/llvm | sed -e 's/\//\\\\\//g' `
+  else
+    SED_INSTALL_DIR=`echo $INSTALL_EXTRAS | sed -e 's/\//\\\\\//g' `
+  fi
+
   export SED_INSTALL_DIR
   echo
   echo " -----Running cmake ---- "