Skip to content

Make build reproducible #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sthibaul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make build reproducible #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ DIRNAME=config
FILES = Makefile ReadMe example.Makefile example.module.mak\
common_make_rules test_make_rules vc_common_make_rules \
config.in vc_config_make_rules-dist \
project.mak system.sh make_system.mak user_flags.mak
project.mak system.sh make_system.mak

#LOCAL_CLEAN = modinclude*.inc system.mak

LOCAL_DISTCLEAN = modinclude*.inc system.mak config user_flags.mak
LOCAL_DISTCLEAN = modinclude*.inc system.mak config

ALL_DIRS = systems compilers rules configs modules

Expand Down
2 changes: 1 addition & 1 deletion config/compilers/gcc_defaults.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ SHARED_LINKFLAGS =
ifndef GCC_MAKE_SHARED_LIB
# Older versions of gcc might have required -fno-shared-data
# MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY $(USER_LINKFLAGS)
MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY $(LDFLAGS)
else
MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
endif
Expand Down
2 changes: 0 additions & 2 deletions config/config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,6 @@ include $(EST)/config/systems/$(SYSTEM_TYPE).mak

include $(EST)/config/compilers/$(COMPILER).mak

include $(EST)/config/user_flags.mak

ifneq ($(JAVA_COMPILER),none)
include $(EST)/config/compilers/$(JAVA_COMPILER).mak
endif
Expand Down
6 changes: 3 additions & 3 deletions config/rules/defaults.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ endif
## Default C Compilation

ifndef CC_COMMAND
CC_COMMAND = $(CC) -c $(CFLAGS) $(COMPILE_CCFLAGS) $(DEFINES) $(INCLUDES) $(USER_CPPFLAGS) $(USER_CFLAGS)
CC_COMMAND = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(COMPILE_CCFLAGS) $(DEFINES) $(INCLUDES)
endif

## Default C++ Compilation

ifndef CXX_COMMAND
CXX_COMMAND = $(CXX) -c $(CXXFLAGS) $(COMPILE_CXXFLAGS) $(DEFINES) $(INCLUDES) $(TEMPLATES) $(USER_CPPFLAGS) $(USER_CXXFLAGS)
CXX_COMMAND = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(COMPILE_CXXFLAGS) $(DEFINES) $(INCLUDES) $(TEMPLATES)
endif

## C++ for dynamic loading
Expand All @@ -205,6 +205,6 @@ endif
## Link a program (not including libraries)

ifndef LINK_COMMAND
LINK_COMMAND = $(CXX) $(LINKFLAGS) $(TEMPLATES) $(USER_LINKFLAGS)
LINK_COMMAND = $(CXX) $(LINKFLAGS) $(TEMPLATES) $(LDFLAGS)
endif

48 changes: 0 additions & 48 deletions config/user_flags.mak.in
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4394,7 +4394,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext


ac_config_files="$ac_config_files config/config config/user_flags.mak"
ac_config_files="$ac_config_files config/config"

cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
Expand Down Expand Up @@ -5103,7 +5103,6 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"config/config") CONFIG_FILES="$CONFIG_FILES config/config" ;;
"config/user_flags.mak") CONFIG_FILES="$CONFIG_FILES config/user_flags.mak" ;;

*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,5 @@ OMP_DEFS=
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <omp.h>]], [[ int j=1;]])],[OMP_DEFS="-DOMP_WAGON=1"],[])
AC_SUBST(OMP_DEFS)

AC_CONFIG_FILES([config/config config/user_flags.mak])
AC_CONFIG_FILES([config/config])
AC_OUTPUT