- Use the configured CXX also in the generated code

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8435 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 31, 2011 · 5995f48 · 5995f48
1 parent b37aa8a
commit 5995f48
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Compiler/runtime/config.h b/Compiler/runtime/config.h
@@ -31,11 +31,11 @@
 #ifndef OPENMODELICA_CONFIG_H
 #define OPENMODELICA_CONFIG_H
 
+#if defined(__MINGW32__) || defined(_MSC_VER) /* Windows */
+
 #define DEFAULT_CC "g++"
 #define DEFAULT_CXX "g++"
 
-#if defined(__MINGW32__) || defined(_MSC_VER) /* Windows */
-
 #define DEFAULT_LDFLAGS "-lc_runtime -lregex"
 
 #define CONFIG_PLATFORM "WIN32"

diff --git a/Compiler/runtime/config.unix.h.in b/Compiler/runtime/config.unix.h.in
@@ -8,15 +8,18 @@
 #define CONFIG_MODELICA_SPEC_PLATFORM "@MODELICA_SPEC_PLATFORM@"
 #define CONFIG_OPENMODELICA_SPEC_PLATFORM "@OPENMODELICA_SPEC_PLATFORM@"
 
+#define DEFAULT_CC "@CXX@"
+#define DEFAULT_CXX "@CXX@"
+
 #if defined(__sparc__)
-  #define DEFAULT_LINKER "g++ -G"
+  #define DEFAULT_LINKER "@CXX@ -G"
 #elif defined(__APPLE_CC__)
-  #define DEFAULT_LINKER "g++ -single_module -dynamiclib -flat_namespace"
+  #define DEFAULT_LINKER "@CXX@ -single_module -dynamiclib -flat_namespace"
 #elif defined(__x86_64__)
   /* -fPIC needed on x86_64! */
-  #define DEFAULT_LINKER "g++ -shared -export-dynamic -fPIC"
+  #define DEFAULT_LINKER "@CXX@ -shared -export-dynamic -fPIC"
 #else
-  #define DEFAULT_LINKER "g++ -shared -export-dynamic"
+  #define DEFAULT_LINKER "@CXX@ -shared -export-dynamic"
 #endif
 
 #ifdef __APPLE_CC__