Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile sakura as C++11 to avoid std::data clash #1092

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Compile sakura as C++11 to avoid std::data clash #1092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/amuse/community/sakura/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,21 @@ CC = $(MPICC)
CXX = $(MPICXX)

CXXFLAGS ?= -Wall -g -O2
CXXFLAGS += -std=c++11


CODELIB = src/libsakura.a
OBJ = interface.o

all: sakura_worker
all: sakura_worker

clean:
rm -f *.so *.o *.pyc worker_code.cc worker_code.h
rm -f *.so *.o *.pyc worker_code.cc worker_code.h
rm -f *~ sakura_worker
make -C src clean

$(CODELIB):
make -C src all
make -C src all CXXFLAGS="$(CXXFLAGS)"

worker_code.cc: interface.py
$(CODE_GENERATOR) --type=c interface.py SakuraInterface -o $@
Expand All @@ -37,5 +38,5 @@ sakura_worker: worker_code.cc worker_code.h $(CODELIB) $(OBJ)
$(MPICXX) $(CXXFLAGS) $(SC_FLAGS) $(LDFLAGS) -I./src $< $(CODELIB) $(OBJ) -o $@ -L./src -lsakura $(SC_CLIBS)

interface.o: interface.cc
$(MPICXX) $(CXXFLAGS) $(SC_FLAGS) -I./src -c -o $@ $<
$(MPICXX) $(CXXFLAGS) $(SC_FLAGS) -I./src -c -o $@ $<

Loading