Skip to content

Commit 17721d8

Browse files
committed
- Add MAKE=xxx to the configure script (to be used to change the make version used by OMC)
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10366 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent c5ec63c commit 17721d8

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

Compiler/runtime/config.unix.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#define DEFAULT_CC "@CC@"
1212
#define DEFAULT_CXX "@CXX@"
13+
#define DEFAULT_MAKE "@MAKE@"
1314

1415
#if defined(__sparc__)
1516
#define DEFAULT_LINKER "@CC@ -G"

configure

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@ CPPFLAGS
620620
LDFLAGS
621621
CFLAGS
622622
CC
623+
MAKE
623624
OPENMP_CFLAGS
624625
SQLITE3_LIBS
625626
OPENMODELICA_SPEC_PLATFORM
@@ -2279,6 +2280,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
22792280

22802281

22812282

2283+
2284+
2285+
if test -z "$MAKE"; then
2286+
MAKE=make
2287+
fi
22822288

22832289
if test x"$prefix" = xNONE; then
22842290
PREFIX=`pwd`/build

configure.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ AC_SUBST(MODELICA_SPEC_PLATFORM)
4343
AC_SUBST(OPENMODELICA_SPEC_PLATFORM)
4444
AC_SUBST(SQLITE3_LIBS)
4545
AC_SUBST(OPENMP_CFLAGS)
46+
AC_SUBST(MAKE)
47+
48+
if test -z "$MAKE"; then
49+
MAKE=make
50+
fi
4651

4752
if test x"$prefix" = xNONE; then
4853
PREFIX=`pwd`/build

0 commit comments

Comments
 (0)