changeset 8057:3ac8040c15dd

Merge
author simonis
date Wed, 18 Sep 2013 11:22:15 +0200
parents a1d5e9d34ad7 3ac08cd5e2e8
children 1ba98d97d91b
files makefiles/CompileJavaClasses.gmk makefiles/CompileLaunchers.gmk makefiles/CompileNativeLibraries.gmk makefiles/GendataFontConfig.gmk makefiles/GensrcX11Wrappers.gmk
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/makefiles/GensrcX11Wrappers.gmk	Wed Sep 11 16:22:13 2013 +0200
+++ b/makefiles/GensrcX11Wrappers.gmk	Wed Sep 18 11:22:15 2013 +0200
@@ -88,7 +88,7 @@
 
     # use -m32/-m64 only if the compiler supports it
     ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG),true)
-    MEMORY_MODEL_FLAG="$(COMP_MODE_OPTION)$*"
+    MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*"
     endif
 
     # Compile the C code into an executable.