浏览代码

HPCC-17425 Various fixes for running HPCC in windows linux subsystem

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 8 年之前
父节点
当前提交
2241da2000
共有 5 个文件被更改,包括 5 次插入3 次删除
  1. 0 2
      .gitattributes
  2. 1 0
      ecl/hqlcpp/hqlres.cpp
  3. 2 0
      initfiles/.gitattributes
  4. 1 1
      initfiles/bash/etc/init.d/export-path
  5. 1 0
      rtl/ecltpl/.gitattributes

+ 0 - 2
.gitattributes

@@ -1,6 +1,5 @@
 *               text=auto
 *.sh            eol=lf
-initfiles/*     eol=lf
 *.bat           eol=crlf
 *.jpg           -text
 *.gif           -text
@@ -11,4 +10,3 @@ initfiles/*     eol=lf
 *.psd           -text
 *.doc           -text
 *.mk            -text
-rtl/ecltpl/*    eol=lf

+ 1 - 0
ecl/hqlcpp/hqlres.cpp

@@ -485,6 +485,7 @@ bool ResourceManager::flush(StringBuffer &filename, const char *basename, bool f
         }
         else
         {
+            fprintf(f, " .section .note.GNU-stack,\"\",@progbits\n");   // Prevent the stack from being marked as executable
             fprintf(f, " .section %s_%u,\"a\"\n", type, id);
             fprintf(f, " .global %s\n", label.str());
             fprintf(f, " .type %s,STT_OBJECT\n", label.str());

+ 2 - 0
initfiles/.gitattributes

@@ -0,0 +1,2 @@
+*               text eol=lf
+*.png           -text

+ 1 - 1
initfiles/bash/etc/init.d/export-path

@@ -15,6 +15,6 @@
 #    limitations under the License.
 ################################################################################
 currentDirectory=`pwd`
-sourceCmd="export PATH=$currentDirectory:${PATH}"
+sourceCmd="export \"PATH=${currentDirectory}:${PATH}\""
 eval $sourceCmd
 ##echo "path = $PATH"

+ 1 - 0
rtl/ecltpl/.gitattributes

@@ -0,0 +1 @@
+*               text eol=lf