Define OCAML_STDLIB_DIR in runtime/Makefile rather than in s.h

ocaml · Sep 25, 2018 · 51493c4 · 51493c4
1 parent 132b3a1
commit 51493c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -328,6 +328,9 @@ Working version
   (Sébastien Hinderer, review by Xavier Leroy, Damien Doligez, Gabriel
   Scherer and Armaël Guéneau)
 
+* GPR#2059: stop defining OCAML_STDLIB_DIR in s.h.
+  (Sébastien Hinderer, review by David Allsopp and Damien Doligez)
+
 * GPR#2066: remove the standard_runtime configuration variable.
   (Sébastien Hinderer, review by Xavier Leroy, Stephen Dolan and
   Damien Doligez)

diff --git a/configure b/configure
@@ -1013,7 +1013,6 @@ config ARCMD "${TOOLPREF}ar"
 # Write the OS type (Unix or Cygwin)
 
 echo "#define OCAML_OS_TYPE \"$ostype\"" >> s.h
-echo "#define OCAML_STDLIB_DIR \"$libdir\"" >> s.h
 
 # Do #! scripts work?
 

diff --git a/runtime/Makefile b/runtime/Makefile
@@ -138,6 +138,9 @@ ifeq "$(UNIX_OR_WIN32)" "win32"
 # pre-Visual Studio 2013 compilers where \x is a non-standard alias for \u.
 OCAML_STDLIB_DIR = $(shell echo $(LIBDIR)| iconv -t JAVA | sed -e 's/\\u/\\x/g')
 OC_CPPFLAGS += -DOCAML_STDLIB_DIR='L"$(OCAML_STDLIB_DIR)"'
+else # Unix
+OCAML_STDLIB_DIR = $(LIBDIR)
+OC_CPPFLAGS += -DOCAML_STDLIB_DIR='"$(OCAML_STDLIB_DIR)"'
 endif
 
 OC_CPPFLAGS += $(IFLEXDIR)