Skip to content

Commit

Permalink
[Compiler version] Remove the cmake and gcc version from Makefile and…
Browse files Browse the repository at this point in the history
… update the ci.yml
  • Loading branch information
yichao-zh committed May 2, 2024
1 parent 89d7e74 commit 92891f6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .gitlab/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ variables:
PATH: '/home/gitlabci/miniconda3/condabin:/home/gitlabci/.cargo/bin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/condor/bin:/usr/sepp/bin:$VERILATOR_ROOT/bin'
OBJCACHE: ''
RISCV_WARNINGS: '-Werror'
CC: 'gcc-8.2.0'
CXX: 'g++-8.2.0'
CMAKE: 'cmake-3.18.1'
CC: 'gcc-11.2.0'
CXX: 'g++-11.2.0'
CMAKE: 'cmake-3.28.3'

workflow:
rules:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ RISCV_TESTS_DIR ?= ${ROOT_DIR}/${SOFTWARE_DIR}/riscv-tests

COMPILER ?= gcc

CMAKE ?= cmake-3.28.3
CMAKE ?= cmake
# CC and CXX are Makefile default variables that are always defined in a Makefile. Hence, overwrite
# the variable if it is only defined by the Makefile (its origin in the Makefile's default).
ifeq ($(origin CC),default)
CC = gcc
CC ?= gcc
endif
ifeq ($(origin CXX),default)
CXX = g++
CXX ?= g++
endif
BENDER_VERSION = 0.28.1

Expand Down Expand Up @@ -190,7 +190,7 @@ setup-dram: config-dram
cd $(DRAMSYS_PATH) && \
if [ ! -d "build" ]; then \
mkdir build && cd build; \
CC=gcc-11.2.0 CXX=g++-11.2.0 cmake -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC -D DRAMSYS_WITH_DRAMPOWER=ON .. ; \
cmake -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC -D DRAMSYS_WITH_DRAMPOWER=ON .. ; \
make -j; \
fi

Expand Down

0 comments on commit 92891f6

Please sign in to comment.