Skip to content

Commit

Permalink
Updated config
Browse files Browse the repository at this point in the history
  • Loading branch information
wulffern committed Dec 27, 2023
2 parents 8b7e6e5 + 2bb3cf5 commit 530afd0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ip/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ cnr_atr_sky130nm:

#- Groups
cnr_gr00_sky130nm:
remote: git@github.com:analogicus/cnr_gr01_sky130nm.git
remote: git@github.com:analogicus/cnr_gr00_sky130nm.git
revision: main

cnr_gr01_sky130nm:
Expand Down
19 changes: 14 additions & 5 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,14 @@ MAGIC_VER=master
NETGEN_VER=master
NGSPICE_VER=master

ifeq (${OS},mac)
CC_GCC=gcc-13
CC_GPP=g++-13
else
CC_GCC=gcc
CC_GPP=g++
endif

#---------------------------------------------------------------------
#- Variables
#---------------------------------------------------------------------
Expand Down Expand Up @@ -66,7 +72,7 @@ tt: tcl_compile tcl_install \
eda_compile: magic_compile \
xschem_compile \
netgen_compile \
-ngspice_compile \
ngspice_compile \
ngspice_compile

eda_install: magic_install \
Expand Down Expand Up @@ -220,11 +226,14 @@ netgen:
cd netgen && git checkout ${NETGEN_VER}

netgen_compile: netgen
#if()
ifeq (${OS},mac)
perl -pe "s/-g/-g -Wno-error=implicit-function-declaration/ig" -i netgen/configure
cd netgen && ./configure --prefix ${EDA_PREFIX}/ --with-tcl=${TK_PREFIX}/lib \
cd netgen && ./configure --prefix ${EDA_PREFIX}/ --with-tclincls=${TK_PREFIX}/include --with-tkincls=${TK_PREFIX}/include --with-tcl=${TK_PREFIX}/lib \
--with-tk=${TK_PREFIX}/lib --x-includes=${X11_INC} --x-libraries=${X11_LIB}&& \
make
else
cd netgen && ./configure --prefix ${EDA_PREFIX}/ && make
endif

netgen_install:
cd netgen && sudo make install
Expand All @@ -243,7 +252,7 @@ ngspice:
# Need to use gcc-11 or gcc-12 from homebrew to get openmp to work
ngspice_compile: ngspice
ifeq (${OS},mac)
cd ngspice && glibtoolize && ./autogen.sh && ./configure \
-cd ngspice && glibtoolize && ./autogen.sh && ./configure \
--prefix ${EDA_PREFIX}/ \
--with-x \
--x-includes=${X11_INC} \
Expand All @@ -258,7 +267,7 @@ ifeq (${OS},mac)
CFLAGS=" -O2 -I${X11_INC}/freetype2 -I/usr/local/include -I/usr/local/opt/readline/include " \
LDFLAGS=" -L/usr/local/opt/bison/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/ncurses/lib -L/usr/local/lib -L/usr/local/opt/libomp/lib/ -fopenmp -lomp"
else
cd ngspice && libtoolize && ./autogen.sh && ./configure \
-cd ngspice && libtoolize && ./autogen.sh && ./configure \
--prefix ${EDA_PREFIX}/ \
--with-x \
--x-includes=/usr/include/X11 \
Expand Down

0 comments on commit 530afd0

Please sign in to comment.