issue #182

CMakeLists.txt

@@ -222,7 +222,7 @@ if (CMAKE_COMPILER_IS_GNUCC AND EMBEDDED_DMRC)
     execute_process(COMMAND ${CMAKE_C_COMPILER} -print-multiarch
             OUTPUT_VARIABLE MULTIARCH_TRIPLET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    set_source_files_properties(dmr_c/src/lib.c PROPERTIES COMPILE_FLAGS "-DGCC_BASE=\"${GCC_BASE}\" -DMULTIARCH_TRIPLET=\"${MULTIARCH_TRIPLET}\"")
+    set_source_files_properties(dmr_c/src/lib.c PROPERTIES COMPILE_FLAGS "-DGCC_BASE=${GCC_BASE} -DMULTIARCH_TRIPLET=${MULTIARCH_TRIPLET}")
 
     message(STATUS "GCC_BASE_DIR      : " ${GCC_BASE})
     message(STATUS "MULTIARCH_TRIPLET : " ${MULTIARCH_TRIPLET})

dmr_c/src/lib.c

@@ -261,6 +261,9 @@ void dmrC_die(struct dmr_C *C, const char *fmt, ...)
 #define ARCH_BIG_ENDIAN 0
 #endif
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 struct dmr_C *new_dmr_C()
 {
 	struct dmr_C *C = (struct dmr_C *)calloc(1, sizeof(struct dmr_C));
@@ -269,12 +272,12 @@ struct dmr_C *new_dmr_C()
 	C->arch_msize_long = 0;
 	C->arch_big_endian = ARCH_BIG_ENDIAN;
 #ifdef GCC_BASE
-	C->gcc_base_dir = GCC_BASE;
+	C->gcc_base_dir = xstr(GCC_BASE);
 #else
 	C->gcc_base_dir = NULL;
 #endif
 #ifdef MULTIARCH_TRIPLET
-	C->multiarch_dir = MULTIARCH_TRIPLET;
+	C->multiarch_dir = xstr(MULTIARCH_TRIPLET);
 #else
 	C->multiarch_dir = NULL;
 #endif