Skip to content

Commit 2e5aa8d

Browse files
committed
Compile modelica3d with gcc instead of clang
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19767 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent a5be7e6 commit 2e5aa8d

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

Makefile.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ datadir = @datadir@
1414
datarootdir = @datarootdir@
1515
docdir = @docdir@
1616
CMAKE = CC=$(CC) CXX=$(CXX) cmake
17+
CMAKE_GCC = GCC_CC=$(CC) GCC_CXX=$(CXX) cmake
1718
CMAKE_TARGET = "Unix Makefiles"
1819
OPENCL = @OPENCL@
1920
AR = @AR@
@@ -27,6 +28,8 @@ APP=@APP@
2728

2829
CC=@CC@
2930
CXX=@CXX@
31+
GCC_CC=@CC@
32+
GCC_CXX=@CXX@
3033
CFLAGS=@CFLAGS@
3134
MSGPACK_CFLAGS =
3235
CPPFLAGS=@CPPFLAGS@
@@ -126,7 +129,7 @@ ifeq (@MODELICA3D@,)
126129
@echo Skipping Modelica3D
127130
else
128131
cd 3rdParty/modelica3d && mkdir -p build
129-
cd 3rdParty/modelica3d/build && $(CMAKE) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 -DUSE_OMC=0 ..
132+
cd 3rdParty/modelica3d/build && $(CMAKE_GCC) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 -DUSE_OMC=0 ..
130133
$(MAKE) -C 3rdParty/modelica3d/build
131134
cp -p 3rdParty/modelica3d/build/backends/osg-gtk/libm3d-osg-gtk.so 3rdParty/modelica3d/build/lib/proc3d/libproc3d.so build/lib/
132135
cp -p 3rdParty/modelica3d/lib/modcount/src/c/modcount.h 3rdParty/modelica3d/lib/modbus/src/c/modbus.h build/include/omc/

configure.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ AC_SUBST(APP)
8484
AC_SUBST(OMC)
8585
AC_SUBST(OMCTARGET)
8686
AC_SUBST(BOOTSTRAP_STATIC)
87+
AC_SUBST(GCC_CC)
88+
AC_SUBST(GCC_CXX)
8789

8890
FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"
8991

@@ -791,6 +793,14 @@ if test -n "$QMAKE"; then
791793
fi
792794
fi
793795

796+
if test -f /usr/bin/gcc -a -f /usr/bin/g++; then
797+
GCC_CC=gcc
798+
GCC_CXX=g++
799+
else
800+
GCC_CC=$CC
801+
GCC_CXX=$CXX
802+
fi
803+
794804
if test "Darwin" = `uname`; then
795805
APP=".app"
796806
EXE=".app"

0 commit comments

Comments
 (0)