From 8f35a3bf7cfd6ce16749c1e57f29d99674132973 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Mon, 9 Apr 2018 21:50:47 +0200
Subject: [PATCH] Fix missing quotes in makefile
---
ci.hocon | 2 +-
com.oracle.truffle.r.native/gnur/Makefile.gnur | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci.hocon b/ci.hocon
index e83063bb4e..8b7bfbd3a9 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -49,7 +49,7 @@ logfiles : [
pkgEnvironment: {
environment : {
PKG_INCLUDE_FLAGS_OVERRIDE : """-I/cm/shared/apps/zlib/1.2.8/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/pcre/8.38/include -I/cm/shared/apps/curl/7.50.1/include"""
- PKG_LDFLAGS_OVERRIDE : """"-L/cm/shared/apps/zlib/1.2.8/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre/8.38/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.9.1/lib64""""
+ PKG_LDFLAGS_OVERRIDE : """-L/cm/shared/apps/zlib/1.2.8/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre/8.38/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.9.1/lib64"""
TZDIR: "/usr/share/zoneinfo"
}
}
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index c8a47818a3..664bbf3874 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -116,7 +116,7 @@ ifneq ($(PKG_INCLUDE_FLAGS_OVERRIDE),)
endif
ifneq ($(PKG_LDFLAGS_OVERRIDE),)
- GNUR_CONFIG_FLAGS := $(GNUR_CONFIG_FLAGS) LDFLAGS=$(PKG_LDFLAGS_OVERRIDE)
+ GNUR_CONFIG_FLAGS := $(GNUR_CONFIG_FLAGS) LDFLAGS="$(PKG_LDFLAGS_OVERRIDE)"
endif
# setup for LLVM (if enabled)
--
GitLab