Browse Source

Revert "fix JULIA_LOAD_PATH"

This reverts commit 52bb4995b1a55ae4a6d6ed5955a8f4babdfd2088.
Samuel Thibault 4 years ago
parent
commit
8e88b063f2
3 changed files with 5 additions and 5 deletions
  1. 1 1
      julia/README
  2. 2 2
      julia/examples/execute.sh.in
  3. 2 2
      julia/setenv.sh

+ 1 - 1
julia/README

@@ -21,7 +21,7 @@ Then, you need to add the lib/ directory to your library path and the julia/
 directory to your Julia load path:
 
 $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
-$ export JULIA_LOAD_PATH=${JULIA_LOAD_PATH:+$JULIA_LOAD_PATH:}:$PWD
+$ export JULIA_LOAD_PATH=$JULIA_LOAD_PATH:$PWD
 
 This step can also be done by sourcing the setenv.sh script:
 

+ 2 - 2
julia/examples/execute.sh.in

@@ -1,7 +1,7 @@
 #!@REALBASH@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2020-2021       Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2020       Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -16,7 +16,7 @@
 #
 
 set -x
-export JULIA_LOAD_PATH=@STARPU_SRC_DIR@/julia${JULIA_LOAD_PATH:+:$JULIA_LOAD_PATH}
+export JULIA_LOAD_PATH=@STARPU_SRC_DIR@/julia:$JULIA_LOAD_PATH
 export STARPU_BUILD_DIR=@STARPU_BUILD_DIR@
 export STARPU_SRC_DIR=@STARPU_SRC_DIR@
 export STARPU_JULIA_LIB=@STARPU_BUILD_DIR@/julia/src/.libs/libstarpujulia-1.3

+ 2 - 2
julia/setenv.sh

@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2020-2021       Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2020       Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -13,7 +13,7 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
-export JULIA_LOAD_PATH=${JULIA_LOAD_PATH:+$JULIA_LOAD_PATH:}$PWD
+export JULIA_LOAD_PATH=$JULIA_LOAD_PATH:$PWD
 
 if [ `uname` == "Darwin" ]; then
     export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib/