diff --git a/ci.hocon b/ci.hocon index e83063bb4e3f0a7aa7f282d8869580bea25f11b9..8b7bfbd3a9160a89c6bf45dbca36a853cb573e4c 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 c8a47818a3b32900a8390ebc46883a27b941d606..664bbf38748ab8c1aba8a7171aac9aa469779952 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)